Changeset 311

Timestamp:

May 12, 2006 10:43:09 AM (13 years ago)

Author:

andreasw

Message:

intermediate commit to be able to move more files

Location:

trunk

Files:

• Cbc/Makefile.am (added)
• Cbc/Makefile.in (added)
• Cbc/cbc_addlibs.txt.in (added)
• Cbc/configure (added)
• Cbc/inc (added)
• Cbc/inc/config_cbc.h.in (added)
• Cbc/src/CbcHeuristic.cpp (modified) (2 diffs)
• Cbc/src/CbcHeuristicFPump.cpp (modified) (1 prop)
• Cbc/src/CbcMain.cpp (moved) (moved from trunk/Cbc/test/CbcMain.cpp)
• Cbc/src/CbcModel.cpp (modified) (12 diffs)
• Cbc/src/CbcNode.cpp (modified) (12 diffs)
• Cbc/src/CbcParam.cpp (moved) (moved from trunk/Cbc/test/CbcParam.cpp)
• Cbc/src/CbcStatistics.cpp (modified) (1 prop)
• Cbc/src/CbcStrategy.cpp (modified) (4 diffs)
• Cbc/src/Makefile.am (added)
• Cbc/src/Makefile.in (added)
• Cbc/src/unitTest.cpp (moved) (moved from trunk/Cbc/test/unitTest.cpp)
• Cbc/test/CbcParam.hpp (copied) (copied from trunk/Cbc/test/include/CbcParam.hpp)
• Cbc/test/Cbc_ampl.h (copied) (copied from trunk/Cbc/test/include/Cbc_ampl.h)
• Cbc/test/Makefile.am (added)
• Cbc/test/Makefile.in (added)
• Cbc/test/include (deleted)
• Makefile.in (added)
• configure (added)

trunk/Cbc/src/CbcHeuristic.cpp

@@ -5 +5 @@
 #  pragma warning(disable:4786)
 #endif
+
+#include "CbcConfig.hpp"
+
 #include <cassert>
 #include <cmath>
 #include <cfloat>
 
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
 #include "OsiClpSolverInterface.hpp"
 #endif
@@ -56 +59 @@
                                   double cutoff, std::string name) const
 {
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
   if (osiclp) {

trunk/Cbc/src/CbcModel.cpp

@@ -5 +5 @@
 #  pragma warning(disable:4786)
 #endif
+
+#include "CbcConfig.hpp"
+
 #include <string>
 //#define CBC_DEBUG 1
@@ -14 +17 @@
 #include <cfloat>
 
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
 // include Presolve from Clp
 #include "ClpPresolve.hpp"
@@ -706 +709 @@
 */
   continuousSolver_ = solver_->clone() ;
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
   OsiClpSolverInterface * clpSolver 
     = dynamic_cast<OsiClpSolverInterface *> (solver_);
@@ -3449 +3452 @@
   int numberFixed = 0 ;
 
-# ifdef CBC_USE_CLP
+# ifdef COIN_HAS_CLP
   OsiClpSolverInterface * clpSolver 
     = dynamic_cast<OsiClpSolverInterface *> (solver_);
@@ -3462 +3465 @@
     { if (solution[iColumn] < lower[iColumn]+integerTolerance && djValue > gap)
       { solver_->setColUpper(iColumn,lower[iColumn]) ;
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
       if (clpSimplex)
         assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atLowerBound);
@@ -3470 +3473 @@
       if (solution[iColumn] > upper[iColumn]-integerTolerance && -djValue > gap)
       { solver_->setColLower(iColumn,upper[iColumn]) ;
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
       if (clpSimplex)
         assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atUpperBound);
@@ -4496 +4499 @@
           }
         }
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
         OsiClpSolverInterface * clpSolver 
           = dynamic_cast<OsiClpSolverInterface *> (solver_);
@@ -4507 +4510 @@
 #endif
       } else {
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
         OsiClpSolverInterface * clpSolver 
           = dynamic_cast<OsiClpSolverInterface *> (solver_);
@@ -6643 +6646 @@
       assert(debugger->onOptimalPath(*cleanModel));
 #endif
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
     // do presolve - for now just clp but easy to get osi interface
     OsiClpSolverInterface * clpSolver 
@@ -7519 +7522 @@
     if (value<oldLevel)
       solver_->messageHandler()->setLogLevel(value);
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
     OsiClpSolverInterface * clpSolver 
       = dynamic_cast<OsiClpSolverInterface *> (solver_);
@@ -7528 +7531 @@
         clpSimplex->setLogLevel(value);
     }
-#else           // CBC_USE_CLP
+#else           // COIN_HAS_CLP
 /*
   For generic OSI solvers, if the new log level is 0, try the
@@ -7536 +7539 @@
       solver_->setHintParam(OsiDoReducePrint,true,OsiHintDo) ;
     }
-#endif          // CBC_USE_CLP
+#endif          // COIN_HAS_CLP
   }
 }

trunk/Cbc/src/CbcNode.cpp

@@ -5 +5 @@
 #  pragma warning(disable:4786)
 #endif
+
+#include "CbcConfig.hpp"
+
 #include <string>
 //#define CBC_DEBUG 1
@@ -30 +33 @@
 #include "CbcFeasibilityBase.hpp"
 #include "CbcMessage.hpp"
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
 #include "OsiClpSolverInterface.hpp"
 #include "ClpSimplexOther.hpp"
@@ -1184 +1187 @@
       if (beforeSolution&&saveLimit<100)
         solver->setIntParam(OsiMaxNumIterationHotStart,100); // go to end
-#     ifdef CBC_USE_CLP      
+#     ifdef COIN_HAS_CLP      
       /* If we are doing all strong branching in one go then we create new arrays
          to store information.  If clp NULL then doing old way.
@@ -1342 +1345 @@
         solver->markHotStart();
       }
-#     else      /* CBC_USE_CLP */
+#     else      /* COIN_HAS_CLP */
 
       OsiSolverInterface *clp = NULL ;
@@ -1352 +1355 @@
       solver->markHotStart();
 
-#     endif     /* CBC_USE_CLP */
+#     endif     /* COIN_HAS_CLP */
       /*
         Open a loop to do the strong branching LPs. For each candidate variable,
@@ -1800 +1803 @@
         delete [] objects;
       }
-#     ifdef CBC_USE_CLP
+#     ifdef COIN_HAS_CLP
       if (osiclp&&!allNormal) {
         // back to normal
@@ -1964 +1967 @@
   bool finished=false;
   int numberToFix=0;
-# ifdef CBC_USE_CLP
+# ifdef COIN_HAS_CLP
   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
   int saveClpOptions=0;
@@ -2358 +2361 @@
         }
       }
-#     ifdef CBC_USE_CLP
+#     ifdef COIN_HAS_CLP
       if (osiclp&&numberPenalties&&neededPenalties) {
         xPen += neededPenalties;
@@ -2420 +2423 @@
         }
       } else
-#     endif     /* CBC_USE_CLP */
+#     endif     /* COIN_HAS_CLP */
       {
         if (!skipAll) {
@@ -3212 +3215 @@
   delete [] upEstimate;
   delete [] downEstimate;
-# ifdef CBC_USE_CLP
+# ifdef COIN_HAS_CLP
   if (osiclp) 
     osiclp->setSpecialOptions(saveClpOptions);
@@ -3278 +3281 @@
                           numberIntegerInfeasibilities,
                           numberObjectInfeasibilities);
-# ifdef CBC_USE_CLP
+# ifdef COIN_HAS_CLP
   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
   int saveClpOptions=0;
@@ -3593 +3596 @@
   // restore solution
   solver->setColSolution(saveSolution);
-# ifdef CBC_USE_CLP
+# ifdef COIN_HAS_CLP
   if (osiclp) 
     osiclp->setSpecialOptions(saveClpOptions);

trunk/Cbc/src/CbcStrategy.cpp

@@ -5 +5 @@
 #  pragma warning(disable:4786)
 #endif
+
+#include "CbcConfig.hpp"
+
 #include <cassert>
 #include <cmath>
@@ -10 +13 @@
 
 #include "OsiSolverInterface.hpp"
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
 #include "OsiClpSolverInterface.hpp"
 #endif
@@ -298 +301 @@
     OsiSolverInterface * solver = model.solver();
     int logLevel = model.messageHandler()->logLevel();
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
     OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver);
     ClpSimplex * lpSolver=NULL;
@@ -342 +345 @@
     } else {
       // now tighten bounds
-#ifdef CBC_USE_CLP
+#ifdef COIN_HAS_CLP
       if (clpSolver) {
         // model has changed