Changeset 311
- Timestamp:
- May 12, 2006 10:43:09 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 12 added
- 1 deleted
- 6 edited
- 2 copied
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcHeuristic.cpp
r310 r311 5 5 # pragma warning(disable:4786) 6 6 #endif 7 8 #include "CbcConfig.hpp" 9 7 10 #include <cassert> 8 11 #include <cmath> 9 12 #include <cfloat> 10 13 11 #ifdef C BC_USE_CLP14 #ifdef COIN_HAS_CLP 12 15 #include "OsiClpSolverInterface.hpp" 13 16 #endif … … 56 59 double cutoff, std::string name) const 57 60 { 58 #ifdef C BC_USE_CLP61 #ifdef COIN_HAS_CLP 59 62 OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver); 60 63 if (osiclp) { -
trunk/Cbc/src/CbcHeuristicFPump.cpp
- Property svn:executable deleted
-
trunk/Cbc/src/CbcModel.cpp
r310 r311 5 5 # pragma warning(disable:4786) 6 6 #endif 7 8 #include "CbcConfig.hpp" 9 7 10 #include <string> 8 11 //#define CBC_DEBUG 1 … … 14 17 #include <cfloat> 15 18 16 #ifdef C BC_USE_CLP19 #ifdef COIN_HAS_CLP 17 20 // include Presolve from Clp 18 21 #include "ClpPresolve.hpp" … … 706 709 */ 707 710 continuousSolver_ = solver_->clone() ; 708 #ifdef C BC_USE_CLP711 #ifdef COIN_HAS_CLP 709 712 OsiClpSolverInterface * clpSolver 710 713 = dynamic_cast<OsiClpSolverInterface *> (solver_); … … 3449 3452 int numberFixed = 0 ; 3450 3453 3451 # ifdef C BC_USE_CLP3454 # ifdef COIN_HAS_CLP 3452 3455 OsiClpSolverInterface * clpSolver 3453 3456 = dynamic_cast<OsiClpSolverInterface *> (solver_); … … 3462 3465 { if (solution[iColumn] < lower[iColumn]+integerTolerance && djValue > gap) 3463 3466 { solver_->setColUpper(iColumn,lower[iColumn]) ; 3464 #ifdef C BC_USE_CLP3467 #ifdef COIN_HAS_CLP 3465 3468 if (clpSimplex) 3466 3469 assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atLowerBound); … … 3470 3473 if (solution[iColumn] > upper[iColumn]-integerTolerance && -djValue > gap) 3471 3474 { solver_->setColLower(iColumn,upper[iColumn]) ; 3472 #ifdef C BC_USE_CLP3475 #ifdef COIN_HAS_CLP 3473 3476 if (clpSimplex) 3474 3477 assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atUpperBound); … … 4496 4499 } 4497 4500 } 4498 #ifdef C BC_USE_CLP4501 #ifdef COIN_HAS_CLP 4499 4502 OsiClpSolverInterface * clpSolver 4500 4503 = dynamic_cast<OsiClpSolverInterface *> (solver_); … … 4507 4510 #endif 4508 4511 } else { 4509 #ifdef C BC_USE_CLP4512 #ifdef COIN_HAS_CLP 4510 4513 OsiClpSolverInterface * clpSolver 4511 4514 = dynamic_cast<OsiClpSolverInterface *> (solver_); … … 6643 6646 assert(debugger->onOptimalPath(*cleanModel)); 6644 6647 #endif 6645 #ifdef C BC_USE_CLP6648 #ifdef COIN_HAS_CLP 6646 6649 // do presolve - for now just clp but easy to get osi interface 6647 6650 OsiClpSolverInterface * clpSolver … … 7519 7522 if (value<oldLevel) 7520 7523 solver_->messageHandler()->setLogLevel(value); 7521 #ifdef C BC_USE_CLP7524 #ifdef COIN_HAS_CLP 7522 7525 OsiClpSolverInterface * clpSolver 7523 7526 = dynamic_cast<OsiClpSolverInterface *> (solver_); … … 7528 7531 clpSimplex->setLogLevel(value); 7529 7532 } 7530 #else // C BC_USE_CLP7533 #else // COIN_HAS_CLP 7531 7534 /* 7532 7535 For generic OSI solvers, if the new log level is 0, try the … … 7536 7539 solver_->setHintParam(OsiDoReducePrint,true,OsiHintDo) ; 7537 7540 } 7538 #endif // C BC_USE_CLP7541 #endif // COIN_HAS_CLP 7539 7542 } 7540 7543 } -
trunk/Cbc/src/CbcNode.cpp
r310 r311 5 5 # pragma warning(disable:4786) 6 6 #endif 7 8 #include "CbcConfig.hpp" 9 7 10 #include <string> 8 11 //#define CBC_DEBUG 1 … … 30 33 #include "CbcFeasibilityBase.hpp" 31 34 #include "CbcMessage.hpp" 32 #ifdef C BC_USE_CLP35 #ifdef COIN_HAS_CLP 33 36 #include "OsiClpSolverInterface.hpp" 34 37 #include "ClpSimplexOther.hpp" … … 1184 1187 if (beforeSolution&&saveLimit<100) 1185 1188 solver->setIntParam(OsiMaxNumIterationHotStart,100); // go to end 1186 # ifdef C BC_USE_CLP1189 # ifdef COIN_HAS_CLP 1187 1190 /* If we are doing all strong branching in one go then we create new arrays 1188 1191 to store information. If clp NULL then doing old way. … … 1342 1345 solver->markHotStart(); 1343 1346 } 1344 # else /* C BC_USE_CLP */1347 # else /* COIN_HAS_CLP */ 1345 1348 1346 1349 OsiSolverInterface *clp = NULL ; … … 1352 1355 solver->markHotStart(); 1353 1356 1354 # endif /* C BC_USE_CLP */1357 # endif /* COIN_HAS_CLP */ 1355 1358 /* 1356 1359 Open a loop to do the strong branching LPs. For each candidate variable, … … 1800 1803 delete [] objects; 1801 1804 } 1802 # ifdef C BC_USE_CLP1805 # ifdef COIN_HAS_CLP 1803 1806 if (osiclp&&!allNormal) { 1804 1807 // back to normal … … 1964 1967 bool finished=false; 1965 1968 int numberToFix=0; 1966 # ifdef C BC_USE_CLP1969 # ifdef COIN_HAS_CLP 1967 1970 OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver); 1968 1971 int saveClpOptions=0; … … 2358 2361 } 2359 2362 } 2360 # ifdef C BC_USE_CLP2363 # ifdef COIN_HAS_CLP 2361 2364 if (osiclp&&numberPenalties&&neededPenalties) { 2362 2365 xPen += neededPenalties; … … 2420 2423 } 2421 2424 } else 2422 # endif /* C BC_USE_CLP */2425 # endif /* COIN_HAS_CLP */ 2423 2426 { 2424 2427 if (!skipAll) { … … 3212 3215 delete [] upEstimate; 3213 3216 delete [] downEstimate; 3214 # ifdef C BC_USE_CLP3217 # ifdef COIN_HAS_CLP 3215 3218 if (osiclp) 3216 3219 osiclp->setSpecialOptions(saveClpOptions); … … 3278 3281 numberIntegerInfeasibilities, 3279 3282 numberObjectInfeasibilities); 3280 # ifdef C BC_USE_CLP3283 # ifdef COIN_HAS_CLP 3281 3284 OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver); 3282 3285 int saveClpOptions=0; … … 3593 3596 // restore solution 3594 3597 solver->setColSolution(saveSolution); 3595 # ifdef C BC_USE_CLP3598 # ifdef COIN_HAS_CLP 3596 3599 if (osiclp) 3597 3600 osiclp->setSpecialOptions(saveClpOptions); -
trunk/Cbc/src/CbcStatistics.cpp
- Property svn:executable deleted
-
trunk/Cbc/src/CbcStrategy.cpp
r310 r311 5 5 # pragma warning(disable:4786) 6 6 #endif 7 8 #include "CbcConfig.hpp" 9 7 10 #include <cassert> 8 11 #include <cmath> … … 10 13 11 14 #include "OsiSolverInterface.hpp" 12 #ifdef C BC_USE_CLP15 #ifdef COIN_HAS_CLP 13 16 #include "OsiClpSolverInterface.hpp" 14 17 #endif … … 298 301 OsiSolverInterface * solver = model.solver(); 299 302 int logLevel = model.messageHandler()->logLevel(); 300 #ifdef C BC_USE_CLP303 #ifdef COIN_HAS_CLP 301 304 OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver); 302 305 ClpSimplex * lpSolver=NULL; … … 342 345 } else { 343 346 // now tighten bounds 344 #ifdef C BC_USE_CLP347 #ifdef COIN_HAS_CLP 345 348 if (clpSolver) { 346 349 // model has changed
Note: See TracChangeset
for help on using the changeset viewer.