Changeset 1267

Timestamp:

Sep 5, 2008 11:25:55 AM (12 years ago)

Author:

forrest

Message:

changes for mahdi's heuristics

Location:

trunk/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (2 diffs)
• CbcOrClpParam.hpp (modified) (1 diff)
• ClpModel.cpp (modified) (3 diffs)
• ClpModel.hpp (modified) (2 diffs)
• ClpParameters.hpp (modified) (1 diff)
• ClpSimplex.cpp (modified) (3 diffs)

trunk/Clp/src/CbcOrClpParam.cpp

@@ -2267 +2267 @@
      "By default clp uses Forrest-Tomlin L-U update.  If you are masochistic you can switch it off."
      ); 
+#endif 
+#ifdef COIN_HAS_CBC
+  parameters[numberParameters++]=
+      CbcOrClpParam("pivot!AndFix","Whether to try Pivot and Fix heuristic",
+                    "off",PIVOTANDFIX);
+  parameters[numberParameters-1].append("on");
+  parameters[numberParameters-1].append("do");
+  parameters[numberParameters-1].setLonghelp
+    (
+     "stuff needed."
+     ); 
+#endif 
+#ifdef COIN_HAS_CLP
   parameters[numberParameters++]=
     CbcOrClpParam("plus!Minus","Tries to make +- 1 matrix",
@@ -2468 +2481 @@
      ); 
 #ifdef COIN_HAS_CBC
+  parameters[numberParameters++]=
+      CbcOrClpParam("rand!omizedRounding","Whether to try randomized rounding heuristic",
+                    "off",RANDROUND);
+  parameters[numberParameters-1].append("on");
+  parameters[numberParameters-1].append("do");
+  parameters[numberParameters-1].setLonghelp
+    (
+     "stuff needed."
+     ); 
   parameters[numberParameters++]=
     CbcOrClpParam("ratio!Gap","Stop when gap between best possible and \

trunk/Clp/src/CbcOrClpParam.hpp

@@ -80 +80 @@
     TWOMIRCUTS,PREPROCESS,FPUMP,GREEDY,COMBINE,LOCALTREE,SOS,
     LANDPCUTS,RINS,RESIDCUTS,RENS,DIVINGS,DIVINGC,DIVINGF,DIVINGG,DIVINGL,
-    DIVINGP,DIVINGV,DINS,
+    DIVINGP,DIVINGV,DINS,PIVOTANDFIX,RANDROUND,
     
     DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,

trunk/Clp/src/ClpModel.cpp

@@ -73 +73 @@
   integerType_(NULL),
   userPointer_(NULL),
+  trustedUserPointer_(NULL),
   numberIterations_(0),
   solveType_(0),
@@ -755 +756 @@
   numberColumns_ = rhs.numberColumns_;
   userPointer_ = rhs.userPointer_;
+  trustedUserPointer_ = rhs.trustedUserPointer_;
   scalingFlag_ = rhs.scalingFlag_;
   specialOptions_ = rhs.specialOptions_;
@@ -3152 +3154 @@
   numberColumns_ = numberColumns;
   userPointer_ = rhs->userPointer_;
+  trustedUserPointer_ = rhs->trustedUserPointer_;
   numberThreads_=0;
 #ifndef CLP_NO_STD

trunk/Clp/src/ClpModel.hpp

@@ -653 +653 @@
   inline void * getUserPointer () const
   { return userPointer_;}
+  /// Trusted user pointer
+  inline void setTrustedUserPointer (ClpTrustedData * pointer)
+  { trustedUserPointer_=pointer;}
+  inline ClpTrustedData * getTrustedUserPointer () const
+  { return trustedUserPointer_;}
   /// What has changed in model (only for masochistic users)
   inline int whatsChanged() const 
@@ -975 +980 @@
   /// User pointer for whatever reason
   void * userPointer_;
+  /// Trusted user pointer e.g. for heuristics
+  ClpTrustedData * trustedUserPointer_;
   /// Array of integer parameters
   int intParam_[ClpLastIntParam];

trunk/Clp/src/ClpParameters.hpp

@@ -114 +114 @@
   }
 }
+/// For a structure to be used by trusted code
+typedef struct {
+  int typeStruct; // allocated as 1,2 etc
+  int typeCall;
+  void * data;
+} ClpTrustedData;
 #endif

trunk/Clp/src/ClpSimplex.cpp

@@ -1696 +1696 @@
     handler_->message()<<CoinMessageEol;
   }
-#ifdef COIN_FACTORIZATION_INFO
-#define COMPUTE_INT_INFEAS
-#endif
-#ifdef COMPUTE_INT_INFEAS
-  if (userPointer_) {
+  if (trustedUserPointer_&&trustedUserPointer_->typeStruct==1) {
     if (algorithm_>0&&integerType_&&!nonLinearCost_->numberInfeasibilities()) {
       if (fabs(theta_)>1.0e-6||!numberIterations_) {
@@ -1711 +1707 @@
           int * numberUnsatisfied;
         } clpSolution;
-        clpSolution * solution = (clpSolution *) userPointer_; 
+        clpSolution * solution = (clpSolution *) trustedUserPointer_->data; 
         if (solution->numberSolutions==solution->maximumSolutions) {
           int n =  solution->maximumSolutions;
@@ -1773 +1769 @@
     }
   }
-#endif
   if (hitMaximumIterations())
     return 2;