Changeset 311 for trunk


Ignore:
Timestamp:
May 12, 2006 10:43:09 AM (14 years ago)
Author:
andreasw
Message:

intermediate commit to be able to move more files

Location:
trunk
Files:
12 added
1 deleted
6 edited
2 copied
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcHeuristic.cpp

    r310 r311  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.hpp"
     9
    710#include <cassert>
    811#include <cmath>
    912#include <cfloat>
    1013
    11 #ifdef CBC_USE_CLP
     14#ifdef COIN_HAS_CLP
    1215#include "OsiClpSolverInterface.hpp"
    1316#endif
     
    5659                                  double cutoff, std::string name) const
    5760{
    58 #ifdef CBC_USE_CLP
     61#ifdef COIN_HAS_CLP
    5962  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
    6063  if (osiclp) {
  • trunk/Cbc/src/CbcHeuristicFPump.cpp

    • Property svn:executable deleted
  • trunk/Cbc/src/CbcModel.cpp

    r310 r311  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.hpp"
     9
    710#include <string>
    811//#define CBC_DEBUG 1
     
    1417#include <cfloat>
    1518
    16 #ifdef CBC_USE_CLP
     19#ifdef COIN_HAS_CLP
    1720// include Presolve from Clp
    1821#include "ClpPresolve.hpp"
     
    706709*/
    707710  continuousSolver_ = solver_->clone() ;
    708 #ifdef CBC_USE_CLP
     711#ifdef COIN_HAS_CLP
    709712  OsiClpSolverInterface * clpSolver
    710713    = dynamic_cast<OsiClpSolverInterface *> (solver_);
     
    34493452  int numberFixed = 0 ;
    34503453
    3451 # ifdef CBC_USE_CLP
     3454# ifdef COIN_HAS_CLP
    34523455  OsiClpSolverInterface * clpSolver
    34533456    = dynamic_cast<OsiClpSolverInterface *> (solver_);
     
    34623465    { if (solution[iColumn] < lower[iColumn]+integerTolerance && djValue > gap)
    34633466      { solver_->setColUpper(iColumn,lower[iColumn]) ;
    3464 #ifdef CBC_USE_CLP
     3467#ifdef COIN_HAS_CLP
    34653468      if (clpSimplex)
    34663469        assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atLowerBound);
     
    34703473      if (solution[iColumn] > upper[iColumn]-integerTolerance && -djValue > gap)
    34713474      { solver_->setColLower(iColumn,upper[iColumn]) ;
    3472 #ifdef CBC_USE_CLP
     3475#ifdef COIN_HAS_CLP
    34733476      if (clpSimplex)
    34743477        assert (clpSimplex->getColumnStatus(iColumn)==ClpSimplex::atUpperBound);
     
    44964499          }
    44974500        }
    4498 #ifdef CBC_USE_CLP
     4501#ifdef COIN_HAS_CLP
    44994502        OsiClpSolverInterface * clpSolver
    45004503          = dynamic_cast<OsiClpSolverInterface *> (solver_);
     
    45074510#endif
    45084511      } else {
    4509 #ifdef CBC_USE_CLP
     4512#ifdef COIN_HAS_CLP
    45104513        OsiClpSolverInterface * clpSolver
    45114514          = dynamic_cast<OsiClpSolverInterface *> (solver_);
     
    66436646      assert(debugger->onOptimalPath(*cleanModel));
    66446647#endif
    6645 #ifdef CBC_USE_CLP
     6648#ifdef COIN_HAS_CLP
    66466649    // do presolve - for now just clp but easy to get osi interface
    66476650    OsiClpSolverInterface * clpSolver
     
    75197522    if (value<oldLevel)
    75207523      solver_->messageHandler()->setLogLevel(value);
    7521 #ifdef CBC_USE_CLP
     7524#ifdef COIN_HAS_CLP
    75227525    OsiClpSolverInterface * clpSolver
    75237526      = dynamic_cast<OsiClpSolverInterface *> (solver_);
     
    75287531        clpSimplex->setLogLevel(value);
    75297532    }
    7530 #else           // CBC_USE_CLP
     7533#else           // COIN_HAS_CLP
    75317534/*
    75327535  For generic OSI solvers, if the new log level is 0, try the
     
    75367539      solver_->setHintParam(OsiDoReducePrint,true,OsiHintDo) ;
    75377540    }
    7538 #endif          // CBC_USE_CLP
     7541#endif          // COIN_HAS_CLP
    75397542  }
    75407543}
  • trunk/Cbc/src/CbcNode.cpp

    r310 r311  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.hpp"
     9
    710#include <string>
    811//#define CBC_DEBUG 1
     
    3033#include "CbcFeasibilityBase.hpp"
    3134#include "CbcMessage.hpp"
    32 #ifdef CBC_USE_CLP
     35#ifdef COIN_HAS_CLP
    3336#include "OsiClpSolverInterface.hpp"
    3437#include "ClpSimplexOther.hpp"
     
    11841187      if (beforeSolution&&saveLimit<100)
    11851188        solver->setIntParam(OsiMaxNumIterationHotStart,100); // go to end
    1186 #     ifdef CBC_USE_CLP     
     1189#     ifdef COIN_HAS_CLP     
    11871190      /* If we are doing all strong branching in one go then we create new arrays
    11881191         to store information.  If clp NULL then doing old way.
     
    13421345        solver->markHotStart();
    13431346      }
    1344 #     else      /* CBC_USE_CLP */
     1347#     else      /* COIN_HAS_CLP */
    13451348
    13461349      OsiSolverInterface *clp = NULL ;
     
    13521355      solver->markHotStart();
    13531356
    1354 #     endif     /* CBC_USE_CLP */
     1357#     endif     /* COIN_HAS_CLP */
    13551358      /*
    13561359        Open a loop to do the strong branching LPs. For each candidate variable,
     
    18001803        delete [] objects;
    18011804      }
    1802 #     ifdef CBC_USE_CLP
     1805#     ifdef COIN_HAS_CLP
    18031806      if (osiclp&&!allNormal) {
    18041807        // back to normal
     
    19641967  bool finished=false;
    19651968  int numberToFix=0;
    1966 # ifdef CBC_USE_CLP
     1969# ifdef COIN_HAS_CLP
    19671970  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
    19681971  int saveClpOptions=0;
     
    23582361        }
    23592362      }
    2360 #     ifdef CBC_USE_CLP
     2363#     ifdef COIN_HAS_CLP
    23612364      if (osiclp&&numberPenalties&&neededPenalties) {
    23622365        xPen += neededPenalties;
     
    24202423        }
    24212424      } else
    2422 #     endif     /* CBC_USE_CLP */
     2425#     endif     /* COIN_HAS_CLP */
    24232426      {
    24242427        if (!skipAll) {
     
    32123215  delete [] upEstimate;
    32133216  delete [] downEstimate;
    3214 # ifdef CBC_USE_CLP
     3217# ifdef COIN_HAS_CLP
    32153218  if (osiclp)
    32163219    osiclp->setSpecialOptions(saveClpOptions);
     
    32783281                          numberIntegerInfeasibilities,
    32793282                          numberObjectInfeasibilities);
    3280 # ifdef CBC_USE_CLP
     3283# ifdef COIN_HAS_CLP
    32813284  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
    32823285  int saveClpOptions=0;
     
    35933596  // restore solution
    35943597  solver->setColSolution(saveSolution);
    3595 # ifdef CBC_USE_CLP
     3598# ifdef COIN_HAS_CLP
    35963599  if (osiclp)
    35973600    osiclp->setSpecialOptions(saveClpOptions);
  • trunk/Cbc/src/CbcStatistics.cpp

    • Property svn:executable deleted
  • trunk/Cbc/src/CbcStrategy.cpp

    r310 r311  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.hpp"
     9
    710#include <cassert>
    811#include <cmath>
     
    1013
    1114#include "OsiSolverInterface.hpp"
    12 #ifdef CBC_USE_CLP
     15#ifdef COIN_HAS_CLP
    1316#include "OsiClpSolverInterface.hpp"
    1417#endif
     
    298301    OsiSolverInterface * solver = model.solver();
    299302    int logLevel = model.messageHandler()->logLevel();
    300 #ifdef CBC_USE_CLP
     303#ifdef COIN_HAS_CLP
    301304    OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (solver);
    302305    ClpSimplex * lpSolver=NULL;
     
    342345    } else {
    343346      // now tighten bounds
    344 #ifdef CBC_USE_CLP
     347#ifdef COIN_HAS_CLP
    345348      if (clpSolver) {
    346349        // model has changed
Note: See TracChangeset for help on using the changeset viewer.