Changeset 390

Timestamp:

Jun 26, 2006 12:11:00 PM (14 years ago)

Author:

forrest

Message:

for sos2 and prohibited

Location:

branches/devel/Cbc/src

Files:

• Cbc_ampl.cpp (modified) (3 diffs)
• CoinSolve.cpp (modified) (15 diffs)

branches/devel/Cbc/src/Cbc_ampl.cpp

@@ -23 +23 @@
 THIS SOFTWARE.
 ****************************************************************/
-#ifdef CBC_AMPL
+
 #include "getstub.h"
 #include "Cbc_ampl.h"
@@ -63 +63 @@
     *blank=' ';
     phrase=blank+1; /* move on */
-    saveInfo->arguments[saveInfo->numberArguments++]=strdup(phrase);
-  } else {
+    if (strlen(phrase))
+      saveInfo->arguments[saveInfo->numberArguments++]=strdup(phrase);
+  } else if (strlen(phrase)) {
     saveInfo->arguments=(char **) realloc(saveInfo->arguments,(saveInfo->numberArguments+1)*sizeof(char *));
     saveInfo->arguments[saveInfo->numberArguments++]=strdup(phrase);
@@ -554 +555 @@
   write_sol(buf,info->primalSolution,info->dualSolution,&Oinfo);
 }
-
-#endif

branches/devel/Cbc/src/CoinSolve.cpp

@@ -2 +2 @@
 // Corporation and others.  All Rights Reserved.
    
+#include "CbcConfig.h"
 #include "CoinPragma.hpp"
 
@@ -79 +80 @@
 
 #include "OsiClpSolverInterface.hpp"
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
 #include "Cbc_ampl.h"
 static bool usingAmpl=false;
@@ -497 +498 @@
     double * sosReference = NULL;
     int * sosPriority=NULL;
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
     ampl_info info;
     if (argc>2&&!strcmp(argv[2],"-AMPL")) {
@@ -824 +825 @@
             verbose &= ~8;
           }
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
           if (verbose<4&&usingAmpl)
             verbose +=4;
@@ -1245 +1246 @@
           // action
           if (type==EXIT) {
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
             if(usingAmpl) {
               if (info.numberIntegers||info.numberBinary) {
@@ -1403 +1404 @@
                 model2=lpSolver;
               }
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
               if (usingAmpl) {
                 double value = model2->getObjValue()*model2->getObjSense();
@@ -1711 +1712 @@
                   int translate[]={9999,0,0,-1,2,3};
                   process.messageHandler()->setLogLevel(babModel->logLevel());
+#ifdef COIN_HAS_ASL
+                  if (info.numberSos&&doSOS&&usingAmpl) {
+                    // SOS
+                    numberSOS = info.numberSos;
+                    sosStart = info.sosStart;
+                    sosIndices = info.sosIndices;
+                  }
+#endif
+                  if (numberSOS&&doSOS) {
+                    // SOS
+                    int numberColumns = saveSolver->getNumCols();
+                    char * prohibited = new char[numberColumns];
+                    memset(prohibited,0,numberColumns);
+                    int n=sosStart[numberSOS];
+                    for (int i=0;i<n;i++) {
+                      int iColumn = sosIndices[i];
+                      prohibited[iColumn]=1;
+                    }
+                    process.passInProhibited(prohibited,numberColumns);
+                    delete [] prohibited;
+                  }
                   solver2 = process.preProcessNonDefault(*saveSolver,translate[preProcess],10);
                   // Tell solver we are not in Branch and Cut
@@ -1717 +1739 @@
                     solver2->setHintParam(OsiDoInBranchAndCut,false,OsiHintDo) ;
                 }
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
                 if (!solver2&&usingAmpl) {
                   // infeasible
@@ -1983 +2005 @@
               }
               if (type==BAB) {
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
                 if (usingAmpl) {
                   priorities=info.priorities;
@@ -2175 +2197 @@
                 }
                 int statistics = (printOptions>0) ? printOptions: 0;
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
                 if (!usingAmpl) {
 #endif
@@ -2200 +2222 @@
                   free(sosPriority);
                   sosPriority=NULL;
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
                 }
 #endif                
@@ -2317 +2339 @@
                            <<babModel->getIterationCount()<<
                     " iterations - took "<<time2-time1<<" seconds"<<std::endl;
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
                 if (usingAmpl) {
                   double value = babModel->getObjValue()*lpSolver->getObjSense();
@@ -2371 +2393 @@
 #endif
               } else {
-                std::cout<<"Model strengthend - now has "<<clpSolver->getNumRows()
+                std::cout<<"Model strengthened - now has "<<clpSolver->getNumRows()
                          <<" rows"<<std::endl;
               }
@@ -2383 +2405 @@
           case IMPORT:
             {
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
               if (!usingAmpl) {
 #endif
@@ -2408 +2430 @@
                 free(sosPriority);
                 sosPriority=NULL;
-#ifdef CBC_AMPL
+#ifdef COIN_HAS_ASL
               }
 #endif