- Timestamp:
- Jul 25, 2007 3:58:09 PM (14 years ago)
- Location:
- trunk/Cbc/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcBranchActual.hpp
r706 r708 58 58 /** Type of each member i.e. which way is strong 0=non SOS, 1 =SOS, 59 59 index is 0 ... numberMembers_-1 */ 60 inline c onst char type(int index) const60 inline char type(int index) const 61 61 {if (type_) return type_[index]; else return 1;} 62 62 -
trunk/Cbc/src/CbcHeuristicLocal.cpp
r687 r708 176 176 return 0; 177 177 numberSolutions_=model_->getSolutionCount(); 178 if ( model_->getNumCols()>100000&&model_->getNumCols()>179 10*model_->getNumRows()||numberSolutions_<=1)178 if ((model_->getNumCols()>100000&&model_->getNumCols()> 179 10*model_->getNumRows())||numberSolutions_<=1) 180 180 return 0; // probably not worth it 181 181 // worth trying -
trunk/Cbc/src/CbcLinked.cpp
r702 r708 5848 5848 double movement = xyTrue-xyLambda; 5849 5849 double mesh=CoinMax(xMeshSize_,yMeshSize_); 5850 if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0] )<mesh||yB[1]-yB[0]<mesh)5850 if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0]<mesh||yB[1]-yB[0]<mesh)) 5851 5851 return 0.0; // say feasible 5852 5852 const double * activity = info->rowActivity_; -
trunk/Cbc/src/CbcModel.hpp
r706 r708 850 850 { return integerVariable_;} 851 851 /// Whether or not integer 852 inline c onst char integerType(int i) const852 inline char integerType(int i) const 853 853 { return integerInfo_[i];} 854 854 /// Whether or not integer -
trunk/Cbc/src/CbcNode.cpp
r702 r708 2870 2870 //numberTest2 = 1000000; 2871 2871 } 2872 if (searchStrategy<0||searchStrategy==1)2872 //if (searchStrategy<0||searchStrategy==1) 2873 2873 //numberTest2 = 1000000; 2874 2874 #if 0 -
trunk/Cbc/src/unitTestClp.cpp
r688 r708 549 549 int presolveOff=iAlg/100; 550 550 iAlg=iAlg % 100; 551 if( !barrierAvailable&&iAlg==0) 551 if( !barrierAvailable&&iAlg==0) { 552 552 if (nRows[m]!=2172) 553 553 iAlg = 5; // try primal 554 554 else 555 555 iAlg=3; // d2q06c 556 } 556 557 solveOptions=setupForSolve(iAlg,nameAlgorithm,0); 557 558 if (presolveOff)
Note: See TracChangeset
for help on using the changeset viewer.