Changeset 192 for branches

Timestamp:

Aug 9, 2003 5:09:12 AM (16 years ago)

Author:

forrest

Message:

For Yiming

Location:

branches/pre

Files:

• ClpNonLinearCost.cpp (modified) (5 diffs)
• Test/MyMessageHandler.cpp (modified) (3 diffs)
• Test/unitTest.cpp (modified) (2 diffs)

branches/pre/ClpNonLinearCost.cpp

@@ -578 +578 @@
     // get where in bound sequence
     int iRange;
+    int currentRange = whichRange_[iPivot];
     double value = model_->solution(iPivot);
     int start = start_[iPivot];
@@ -595 +596 @@
     double & cost = model_->costAddress(iPivot);
     whichRange_[iPivot]=iRange;
+    if (iRange!=currentRange) {
+      if (infeasible(iRange))
+        numberInfeasibilities_++;
+      if (infeasible(currentRange))
+        numberInfeasibilities_--;
+    }
     lower = lower_[iRange];
     upper = lower_[iRange+1];
@@ -643 +650 @@
       double & cost = model_->costAddress(iPivot);
       whichRange_[iPivot]=iRange;
+      if (infeasible(iRange))
+        numberInfeasibilities_++;
+      if (infeasible(jRange))
+        numberInfeasibilities_--;
       lower = lower_[iRange];
       upper = lower_[iRange+1];
@@ -658 +669 @@
   // get where in bound sequence
   int iRange;
+  int currentRange = whichRange_[iPivot];
   int start = start_[iPivot];
   int end = start_[iPivot+1]-1;
@@ -690 +702 @@
   assert(iRange<end);
   whichRange_[iPivot]=iRange;
+  if (iRange!=currentRange) {
+    if (infeasible(iRange))
+      numberInfeasibilities_++;
+    if (infeasible(currentRange))
+      numberInfeasibilities_--;
+  }
   double & lower = model_->lowerAddress(iPivot);
   double & upper = model_->upperAddress(iPivot);

branches/pre/Test/MyMessageHandler.cpp

@@ -10 +10 @@
 
 #include "ClpSimplex.hpp"
+#include "ClpNonLinearCost.hpp"
 #include "MyMessageHandler.hpp"
 #include "ClpMessage.hpp"
@@ -91 +92 @@
 {
   if (currentSource()=="Clp") {
-    if (currentMessage().externalNumber()==5) {
-      // Are we feasible
-      // We can pick up two ways - check same
-      assert (model_->numberPrimalInfeasibilities()==
-        intValue(1));
-      if (!intValue(1)&&intValue(0)!=iterationNumber_) {
-        iterationNumber_ = intValue(0);
+    if (currentMessage().externalNumber()==102) {
+      printf("There are %d primal infeasibilities\n",
+             model_->nonLinearCost()->numberInfeasibilities());
+      // Feasibility
+      if (!model_->nonLinearCost()->numberInfeasibilities()) {
         // Column solution
         int numberColumns = model_->numberColumns();
         const double * solution = model_->solutionRegion(1);
-
+        
         // Create vector to contain solution
         StdVectorDouble feasibleExtremePoint;
-
+        
+        const double *objective = model_->objective();
+        double objectiveValue = 0;
+        
         if (!model_->columnScale()) {
           // No scaling
-          for (int i=0;i<numberColumns;i++)
+          for (int i=0;i<numberColumns;i++) {
             feasibleExtremePoint.push_back(solution[i]);
+            objectiveValue += solution[i]*objective[i];
+          }
         } else {
           // scaled
           const double * columnScale = model_->columnScale();
-          for (int i=0;i<numberColumns;i++)
+          for (int i=0;i<numberColumns;i++) {
             feasibleExtremePoint.push_back(solution[i]*columnScale[i]);
+            objectiveValue += solution[i]*objective[i]*columnScale[i];
+          }
         }
+        std::cout << "Objective "<< objectiveValue << std::endl;
         // Save solution
         feasibleExtremePoints_.push_front(feasibleExtremePoint);
-
+        
         // Want maximum of 10 solutions, so if more then 10 get rid of oldest
         int numExtremePointsSaved = feasibleExtremePoints_.size();
@@ -127 +134 @@
 
       }
+      return 0; // skip printing
     }
   }

branches/pre/Test/unitTest.cpp

@@ -518 +518 @@
     CoinMpsIO m;
     std::string fn = mpsDir+"exmip1";
+    fn = "Test/subGams4";
     m.readMps(fn.c_str(),"mps");
-    ClpSimplex solution;
-    solution.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
+    ClpSimplex model;
+    model.loadProblem(*m.getMatrixByCol(),m.getColLower(),m.getColUpper(),
                          m.getObjCoefficients(),
                          m.getRowLower(),m.getRowUpper());
     // Message handler
-    MyMessageHandler messageHandler(&solution);
+    MyMessageHandler messageHandler(&model);
     std::cout<<"Testing derived message handler"<<std::endl;
-    solution.passInMessageHandler(&messageHandler);
-    solution.primal();
+    model.passInMessageHandler(&messageHandler);
+    model.messagesPointer()->setDetailMessage(1,102);
+    model.setFactorizationFrequency(10);
+    model.primal();
 
     // Write saved solutions
-    int nc = solution.getNumCols();
+    int nc = model.getNumCols();
     int s; 
     std::deque<StdVectorDouble> fep = messageHandler.getFeasibleExtremePoints();
@@ -541 +544 @@
       }
     }
-    // solve again without scaling
+    // Solve again without scaling
+    // and maximize then minimize
     messageHandler.clearFeasibleExtremePoints();
-    solution.scaling(0);
-    solution.allSlackBasis();
-    solution.primal();
+    model.scaling(0);
+    model.setOptimizationDirection(-1);
+    model.primal();
+    model.setOptimizationDirection(1);
+    model.primal();
     fep = messageHandler.getFeasibleExtremePoints();
     numSavedSolutions = fep.size();