Changeset 65


Ignore:
Timestamp:
Oct 13, 2006 4:12:09 PM (13 years ago)
Author:
andreasw
Message:

added first compiling (but probably buggy) version of the curvature estimator. Also made BonTMINLP2TNLP.cpp compile with --with-ipopt-checklevel=1

Location:
branches/devel/Bonmin/src/IpoptInterface
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/IpoptInterface/BonTMINLP2TNLP.cpp

    r64 r65  
    363363    if(iRow != NULL)
    364364    {
    365       DBG_ASSERT(iCol != NULL);
    366       DBG_ASSERT(values == NULL)
     365      DBG_ASSERT(jCol != NULL);
     366      DBG_ASSERT(values == NULL);
    367367     
    368368      int nnz = nele_jac - tminlp_->linearCutsNnz_ ;
     
    375375    else
    376376    {
    377       DBG_ASSERT(iCol == NULL);
     377      DBG_ASSERT(jCol == NULL);
    378378      DBG_ASSERT(values != NULL);
    379379      IpBlasDcopy(tminlp_->linearCutsNnz_ , tminlp_->elems_, 1, &values[nele_jac - tminlp_->linearCutsNnz_],1);
  • branches/devel/Bonmin/src/IpoptInterface/Makefile.am

    r64 r65  
    1919        BonBoundsReader.cpp BonBoundsReader.hpp \
    2020        BonColReader.cpp BonColReader.hpp \
     21        BonCurvatureEstimator.cpp BonCurvatureEstimator.hpp \
    2122        BonStartPointReader.cpp BonStartPointReader.hpp \
    2223        BonIpoptInterface.cpp BonIpoptInterface.hpp \
     
    4344        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    4445        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
     46        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg/TMatrices` \
    4547        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Algorithm` \
     48        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Algorithm/LinearSolvers` \
    4649        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    4750        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
  • branches/devel/Bonmin/src/IpoptInterface/Makefile.in

    r64 r65  
    6262am__libipoptinterface_la_SOURCES_DIST = BonBoundsReader.cpp \
    6363        BonBoundsReader.hpp BonColReader.cpp BonColReader.hpp \
     64        BonCurvatureEstimator.cpp BonCurvatureEstimator.hpp \
    6465        BonStartPointReader.cpp BonStartPointReader.hpp \
    6566        BonIpoptInterface.cpp BonIpoptInterface.hpp \
     
    7475@COIN_HAS_FSQP_TRUE@am__objects_1 = BonFilterSolver.lo
    7576am_libipoptinterface_la_OBJECTS = BonBoundsReader.lo BonColReader.lo \
    76         BonStartPointReader.lo BonIpoptInterface.lo \
    77         BonOsiTMINLPInterface.lo BonIpoptInteriorWarmStarter.lo \
    78         BonIpoptWarmStart.lo BonTMINLP2TNLP.lo BonTMINLP.lo \
    79         BonIpoptSolver.lo BonTNLPSolver.lo BonTNLP2FPNLP.lo \
    80         $(am__objects_1)
     77        BonCurvatureEstimator.lo BonStartPointReader.lo \
     78        BonIpoptInterface.lo BonOsiTMINLPInterface.lo \
     79        BonIpoptInteriorWarmStarter.lo BonIpoptWarmStart.lo \
     80        BonTMINLP2TNLP.lo BonTMINLP.lo BonIpoptSolver.lo \
     81        BonTNLPSolver.lo BonTNLP2FPNLP.lo $(am__objects_1)
    8182libipoptinterface_la_OBJECTS = $(am_libipoptinterface_la_OBJECTS)
    8283depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    331332# List all source files, including headers
    332333libipoptinterface_la_SOURCES = BonBoundsReader.cpp BonBoundsReader.hpp \
    333         BonColReader.cpp BonColReader.hpp BonStartPointReader.cpp \
     334        BonColReader.cpp BonColReader.hpp BonCurvatureEstimator.cpp \
     335        BonCurvatureEstimator.hpp BonStartPointReader.cpp \
    334336        BonStartPointReader.hpp BonIpoptInterface.cpp \
    335337        BonIpoptInterface.hpp BonOsiTMINLPInterface.cpp \
     
    349351        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    350352        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg` \
     353        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/LinAlg/TMatrices` \
    351354        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Algorithm` \
     355        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Algorithm/LinearSolvers` \
    352356        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` \
    353357        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Apps/AmplSolver` \
     
    460464@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonBoundsReader.Plo@am__quote@
    461465@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonColReader.Plo@am__quote@
     466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCurvatureEstimator.Plo@am__quote@
    462467@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonFilterSolver.Plo@am__quote@
    463468@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptInterface.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.