Changeset 1595 for trunk

Timestamp:

Aug 28, 2010 9:03:22 PM (9 years ago)

Author:

lou

Message:

Remove setObjectiveAndRefresh. Make getReducedGradient const. A few other
minor tweaks.

Location:

trunk/Clp

Files:

• src/OsiClp/OsiClpSolverInterface.cpp (modified) (5 diffs)
• src/OsiClp/OsiClpSolverInterface.hpp (modified) (1 diff)
• test/OsiClpSolverInterfaceTest.cpp (modified) (4 diffs)

trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

@@ -4555 +4555 @@
   return difference;
 }
-/* Read an mps file from the given filename (defaults to Osi reader) - returns
-   number of errors (see OsiMpsReader class) */
+/*
+  Read an mps file from the given filename - returns number of errors
+  (see CoinMpsIO class)
+*/
 int 
 OsiClpSolverInterface::readMps(const char *filename,
@@ -4575 +4577 @@
   numberSOS_=0;
   CoinSet ** sets=NULL;
+  // Temporarily reduce log level to get CoinMpsIO to shut up.
+  int saveLogLevel = modelPtr_->messageHandler()->logLevel() ;
+  modelPtr_->messageHandler()->setLogLevel(0) ;
   int numberErrors = m.readMps(filename,extension,numberSOS_,sets);
+  modelPtr_->messageHandler()->setLogLevel(saveLogLevel) ;
   if (numberSOS_) {
     setInfo_ = new CoinSet[numberSOS_];
@@ -5640 +5646 @@
                                           double* columnReducedCosts, 
                                           double * duals,
-                                          const double * c)
+                                          const double * c) const
 {
   assert (modelPtr_->solveType()==2);
@@ -5657 +5663 @@
 }
 
+#if 0
+
+  Deleted from OsiSimplex API 100828. Leave the code here for a bit just in
+  case someone yells.  -- lh, 100828 --
+
 /* Set a new objective and apply the old basis so that the
-   reduced costs are properly updated  */
+   reduced costs are properly updated
+*/
 void OsiClpSolverInterface::setObjectiveAndRefresh(const double* c)
 {
@@ -5671 +5683 @@
   modelPtr_->computeDuals(NULL);
 }
+#endif
 
 //Get a row of the tableau (slack part in slack if not NULL)

trunk/Clp/src/OsiClp/OsiClpSolverInterface.hpp

@@ -182 +182 @@
   virtual void getReducedGradient(double* columnReducedCosts, 
                                   double * duals,
-                                  const double * c);
-  
-  /** Set a new objective and apply the old basis so that the
-      reduced costs are properly updated  */
-  virtual void setObjectiveAndRefresh(const double* c);
+                                  const double * c) const ;
   
   ///Get a row of the tableau (slack part in slack if not NULL)

trunk/Clp/test/OsiClpSolverInterfaceTest.cpp

@@ -1175 +1175 @@
     m.initialSolve();
   }
+# if 0
+/*
+  This section stops working without setObjectiveAndRefresh. Assertion failure
+  down in the guts of clp, likely due to reduced costs not properly updated.
+  Leave the code in for a bit so it's easily recoverable if anyone actually
+  yells about the loss. There was no response to a public announcement
+  of intent to delete, but sometimes it takes a whack on the head to get
+  peoples' attention. At some point, it'd be good to come back through and
+  make this work again. -- lh, 100828 --
+*/
   // Do parametrics on the objective by hand
-  {    
+  {
+    std::cout << " Beginning Osi Simplex mode 2 ... " << std::endl ;
     OsiClpSolverInterface m;
     std::string fn = mpsDir+"p0033";
@@ -1207 +1218 @@
     double totalDone=0.0;
     while (true) {
+      std::cout << " Starting iterations ... " << std::endl ;
       // Save current
       // (would be more accurate to start from scratch)
@@ -1292 +1304 @@
     delete [] djsNow;
     // exit special mode
+    std::cout << " Finished simplex mode 2 ; checking result." << std::endl ;
     m.disableSimplexInterface();
     simplex->messageHandler()->setLogLevel(4);
@@ -1297 +1310 @@
     assert (!m.getIterationCount());
   }
+# endif
   // Solve an lp when interface is on
   {