Changeset 1519 for trunk/Cbc/examples


Ignore:
Timestamp:
Nov 4, 2010 11:06:24 AM (7 years ago)
Author:
lou
Message:

Track modifications to CbcCompareBase::newSolution and fix Makefile.in so
examples will build again.

Location:
trunk/Cbc/examples
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/examples/CbcCompareUser.cpp

    r640 r1519  
    133133  if (numberSolutions_>5)
    134134    weight_ =0.0; // this searches on objective
     135  return (true) ;
    135136}
    136137// This allows method to change behavior
     
    216217// This allows method to change behavior as it is called
    217218// after each solution
    218 void
     219bool
    219220CbcCompareUser::newSolution(CbcModel * model,
    220221                               double objectiveAtContinuous,
     
    223224  if (model->getSolutionCount()==model->getNumberHeuristicSolutions()&&
    224225      model->getSolutionCount()<5&&model->getNodeCount()<500)
    225     return; // solution was got by rounding
     226    return (false) ; // solution was got by rounding
    226227  // set to get close to this solution
    227228  double costPerInteger =
     
    233234  if (numberSolutions_>5)
    234235    weight_ =0.0; // this searches on objective
     236  return (true) ;
    235237}
    236238// This allows method to change behavior
  • trunk/Cbc/examples/CbcCompareUser.hpp

    r706 r1519  
    3636  // This allows method to change behavior as it is called
    3737  // after each solution
    38   virtual void newSolution(CbcModel * model,
     38  virtual bool newSolution(CbcModel * model,
    3939                           double objectiveAtContinuous,
    4040                           int numberInfeasibilitiesAtContinuous) ;
  • trunk/Cbc/examples/Makefile.in

    r1501 r1519  
    6767
    6868# Libraries necessary to link with Cbc
    69 LIBS = @CBCLIB_LIBS@ -L$(COINLIBDIR) -L$(COINLIBDIR)/ThirdParty -lCbcSolver -lCbc -lOsiCbc
     69LIBS = -lCbcSolver -lCbc -lOsiCbc @CBCLIB_LIBS@ -L$(COINLIBDIR) -L$(COINLIBDIR)/ThirdParty
    7070
    7171# Necessary Include dirs (we use the CYGPATH_W variables to allow
Note: See TracChangeset for help on using the changeset viewer.