Changeset 503


Ignore:
Timestamp:
Apr 25, 2007 3:16:35 PM (12 years ago)
Author:
pbonami
Message:

Fix few problem in fun

Location:
trunk/Bonmin/experimental/NotConvex
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/experimental/NotConvex/BonCouenneSetup.cpp

    r502 r503  
    3939    /* Initialize Couenne cut generator.*/
    4040    CouenneCutGenerator * couenneCg = new CouenneCutGenerator(ci, aslfg, true, CURRENT_ONLY,1);
    41     const CouenneProblem * couenneProb = couenneCg -> Problem();
     41    CouenneProblem * couenneProb = couenneCg -> Problem();
    4242
    4343    Bonmin::BabInfo * extraStuff = new Bonmin::BabInfo(0);
     
    114114      NlpSolveHeuristic * nlpHeuristic = new NlpSolveHeuristic;
    115115      nlpHeuristic->setNlp(*ci,false);
     116      nlpHeuristic->setCouenneProblem(couenneProb);
    116117      nlpHeuristic->setMaxNlpInf(1e10);
    117118      heuristics_.push_back(nlpHeuristic);
  • trunk/Bonmin/experimental/NotConvex/BonNlpHeuristic.cpp

    r502 r503  
    8181 
    8282  void
    83   NlpSolveHeuristic::setCouenneProblem(CouenneProblem & couenne){
    84     couenne_ = &couenne;}
     83  NlpSolveHeuristic::setCouenneProblem(CouenneProblem * couenne){
     84    couenne_ = couenne;}
    8585  int
    8686  NlpSolveHeuristic::solution( double & objectiveValue, double * newSolution){
  • trunk/Bonmin/experimental/NotConvex/BonNlpHeuristic.hpp

    r502 r503  
    3838   
    3939    /** set the couenne problem to use.*/
    40     void setCouenneProblem(CouenneProblem &);
     40    void setCouenneProblem(CouenneProblem *);
    4141    /** Does nothing. */
    4242    virtual void resetModel(CbcModel * model){}
  • trunk/Bonmin/experimental/NotConvex/Makefile.in

    r481 r503  
    7272binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    7373PROGRAMS = $(bin_PROGRAMS)
    74 am_fun_OBJECTS = BonCouenne.$(OBJEXT) BonCouenneCbc.$(OBJEXT) \
    75         BonCouenneSetup.$(OBJEXT) BonNlpHeuristic.$(OBJEXT) \
    76         BonCouenneInterface.$(OBJEXT)
     74am_fun_OBJECTS = BonCouenne.$(OBJEXT) BonCouenneSetup.$(OBJEXT) \
     75        BonNlpHeuristic.$(OBJEXT) BonCouenneInterface.$(OBJEXT)
    7776fun_OBJECTS = $(am_fun_OBJECTS)
    7877am__DEPENDENCIES_1 = $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
     
    383382        $(am__append_4) $(am__append_5)
    384383fun_SOURCES = BonCouenne.cpp \
    385               BonCouenneCbc.hpp \
    386               BonCouenneCbc.cpp \
    387384              BonCouenneSetup.cpp \
    388385              BonCouenneSetup.hpp \
     
    479476
    480477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenne.Po@am__quote@
    481 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneCbc.Po@am__quote@
    482478@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneInterface.Po@am__quote@
    483479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneSetup.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.