Changeset 414 for branches/devel


Ignore:
Timestamp:
Jul 15, 2006 1:12:07 PM (13 years ago)
Author:
forrest
Message:

mostly try and simplify CbcOr?...

Location:
branches/devel/Cbc
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/examples/qmip2.cpp

    r394 r414  
    188188  // This clones solver
    189189  CbcModel model(solver1);
    190   // Add stored cuts
    191   model.addCutGenerator(&stored,-1,"Stored");
     190  // Add stored cuts (making sure at all depths)
     191  model.addCutGenerator(&stored,1,"Stored",true,false,false,-100,1,-1);
    192192  /*  You need the next few lines -
    193193      a) so that cut generator will always be called again if it generated cuts
    194194      b) it is known that matrix is not enough to define problem so do cuts even
    195195         if it looks integer feasible at continuous optimum.
    196       c) a solution found ny strong branching will be ignored.
     196      c) a solution found by strong branching will be ignored.
     197      d) don't recompute a solution once found
    197198  */
    198199  // Make sure cut generator called correctly (a)
     
    205206  CbcFeasibilityNoStrong noStrong;
    206207  model.setProblemFeasibility(noStrong);
     208  // Say don't recompute solution d)
     209  model.setSpecialOptions(4);
    207210 
    208211  double time1 = CoinCpuTime();
  • branches/devel/Cbc/src/CbcModel.cpp

    r411 r414  
    934934      numberPassesLeft--;
    935935      if (anyAction == -1)
    936       { feasible = resolve(NULL,10) != 0 ;
     936      {
     937        //if (solverCharacteristics_->solverType()!=4)
     938          feasible = resolve(NULL,10) != 0 ;
     939          //else
     940          //feasible = solveWithCuts(cuts,maximumCutPassesAtRoot_,NULL);
    937941      if (problemFeasibility_->feasible(this,0)<0) {
    938942        feasible=false; // pretend infeasible
     
    14451449              int easy=2;
    14461450              solver_->setHintParam(OsiDoInBranchAndCut,true,OsiHintDo,&easy) ;
    1447               feasible = resolve(node ? node->nodeInfo() : NULL,11) != 0 ;
     1451              //if (solverCharacteristics_->solverType()!=4)
     1452                feasible = resolve(node ? node->nodeInfo() : NULL,11) != 0 ;
     1453                //else
     1454                //feasible = solveWithCuts(cuts,maximumCutPasses_,node);
    14481455              solver_->setHintParam(OsiDoInBranchAndCut,true,OsiHintDo,NULL) ;
    14491456              resolved = true ;
     
    19111918    phase_=5;
    19121919    double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
    1913     bestObjective_ += 100.0*increment+1.0e-3;
     1920    if ((specialOptions_&4)!=0)
     1921      bestObjective_ += 100.0*increment+1.0e-3; // only set if we are going to solve
    19141922    setBestSolution(CBC_END_SOLUTION,bestObjective_,bestSolution_,true) ;
    19151923    continuousSolver_->resolve() ;
  • branches/devel/Cbc/src/Makefile.am

    r409 r414  
    6060        CbcMain.cpp \
    6161        CbcParam.cpp CbcParam.hpp \
     62        CbcCbcParam.cpp \
    6263        unitTest.cpp
    63 
    64 # The following file is not to be distributed, since it is "borrowed" from Clp
    65 nodist_cbc_generic_SOURCES = CbcOrClpParam.cpp
    6664
    6765cbc_generic_LDADD = libCbc.la \
     
    171169cbc_SOURCES = \
    172170        CoinSolve.cpp \
     171        CbcCbcParam.cpp \
    173172        unitTestClp.cpp
    174 
    175 # The following file is not to be distributed, since it is "borrowed" from Clp
    176 nodist_cbc_SOURCES = CbcOrClpParam.cpp
    177173
    178174# Additional COIN libraries
Note: See TracChangeset for help on using the changeset viewer.