Changeset 238

Timestamp:

Jan 31, 2006 11:39:18 AM (14 years ago)

Author:

forrest

Message:

small stuff

Location:

trunk

Files:

• CbcBranchLotsize.cpp (modified) (1 diff)
• CbcCutGenerator.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (6 diffs)
• include/CbcCutGenerator.hpp (modified) (2 diffs)

trunk/CbcBranchLotsize.cpp

@@ -546 +546 @@
 {
   OsiSolverInterface * solver = model_->solver();
-  double value = model_->testSolution()[columnNumber_];
-
-  assert (findRange(value));
+
+  assert (findRange(model_->testSolution()[columnNumber_]));
   double dj = solver->getObjSense()*solver->getReducedCost()[columnNumber_];
   CbcLotsizeBranchingObject * object = NULL;

trunk/CbcCutGenerator.cpp

@@ -214 +214 @@
         }
       }
+      returnCode = !solver->basisIsAvailable();
     }
     if (timing_)

trunk/CbcModel.cpp

@@ -1104 +1104 @@
       int saveNumber = numberIterations_;
       feasible = solveWithCuts(cuts,maximumCutPasses_,node);
+      if ((specialOptions_&1)!=0&&onOptimalPath) {
+        const OsiRowCutDebugger *debugger = solver_->getRowCutDebugger() ;
+        assert (debugger) ;
+      }
       if (statistics_) {
         assert (numberNodes2_);
@@ -1135 +1139 @@
         use variable() (i.e., presence of a branching variable). Equivalent?
 */
-        if (onOptimalPath)
+        if (onOptimalPath) {
+          if (!feasible) {
+            printf("infeas2\n");
+            solver_->writeMps("infeas");
+            CoinWarmStartBasis *slack =
+              dynamic_cast<CoinWarmStartBasis *>(solver_->getEmptyWarmStart()) ;
+            solver_->setWarmStart(slack);
+            delete slack ;
+            solver_->setHintParam(OsiDoReducePrint,false,OsiHintDo,0) ;
+            solver_->initialSolve();
+            assert (!solver_->isProvenOptimal());
+          }
           assert (feasible);
+        }
         bool checkingNode=false;
         if (feasible)
@@ -4955 +4971 @@
       int numberColumnCutsBefore = theseCuts.sizeColCuts() ;
       if (i<numberCutGenerators_) {
-        if (generator_[i]->normal()) {
+        bool generate = generator_[i]->normal();
+        // skip if not optimal and should be (maybe a cut generator has fixed variables)
+        if (generator_[i]->needsOptimalBasis()&&!solver_->basisIsAvailable())
+          generate=false;
+        if (generate) {
           bool mustResolve = 
             generator_[i]->generateCuts(theseCuts,fullScan,node) ;
@@ -5508 +5528 @@
     double totalCuts = 0.0 ;
     //#define JUST_ACTIVE
-    for (i = 0;i<numberCutGenerators_;i++) 
+    for (i = 0;i<numberCutGenerators_;i++) {
       if (countRowCuts[i]||countColumnCuts[i])
         numberActiveGenerators++;
@@ -5516 +5536 @@
       totalCuts += countRowCuts[i] + 5.0*countColumnCuts[i] ;
 #endif
+    }
     double small = (0.5* totalCuts) /
       ((double) numberActiveGenerators) ;
@@ -6743 +6764 @@
     int lastNumberCuts=0;
     for (i=0;i<numberCutGenerators_;i++) {
-      if (generator_[i]->atSolution()) {
+      bool generate = generator_[i]->atSolution();
+      // skip if not optimal and should be (maybe a cut generator has fixed variables)
+      if (generator_[i]->needsOptimalBasis()&&!solver_->basisIsAvailable())
+        generate=false;
+      if (generate) {
         generator_[i]->generateCuts(theseCuts,true,NULL);
         int numberCuts = theseCuts.sizeRowCuts();

trunk/include/CbcCutGenerator.hpp

@@ -6 +6 @@
 #include "OsiSolverInterface.hpp"
 #include "OsiCuts.hpp"
+#include "CglCutGenerator.hpp"
 
 class CbcModel;
 class OsiRowCut;
 class OsiRowCutDebugger;
-class CglCutGenerator;
 
 //#############################################################################
@@ -205 +205 @@
   inline int switchOffIfLessThan() const
   { return switchOffIfLessThan_;};
+  /// Say if optimal basis needed
+  inline bool needsOptimalBasis() const
+  { return generator_->needsOptimalBasis();};
   //@}