Changeset 1077

Timestamp:

Aug 10, 2007 5:15:23 PM (12 years ago)

Author:

ladanyi

Message:

Added new parameters to indicate location of Sample/Netlib?/mplib problems

Location:

branches/BSP/trunk/Clp

Files:

• src/CbcOrClpParam.cpp (modified) (1 diff)
• src/CbcOrClpParam.hpp (modified) (1 diff)
• src/ClpMain.cpp (modified) (5 diffs)
• test/Makefile.am (modified) (1 diff)
• test/Makefile.in (modified) (1 diff)

branches/BSP/trunk/Clp/src/CbcOrClpParam.cpp

@@ -1413 +1413 @@
     (
      "This sets the directory which import, export, saveModel, restoreModel etc will use.\
-  This is also the directory where the netlib problems are read from when unitTest\
-  is invoked with -netlib or -netlibp.\
   It is initialized to './'"
+     ); 
+  parameters[numberParameters++]=
+    CbcOrClpParam("dirSample","Set directory where the COIN-OR sample problems are.",
+                  DIRSAMPLE);
+  parameters[numberParameters-1].setLonghelp
+    (
+     "This sets the directory where the COIN-OR sample problems reside. It is\
+ used only when -unitTest is passed to clp. clp will pick up the test problems\
+ from this directory.\
+ It is initialized to '../../Data/Sample'"
+     ); 
+  parameters[numberParameters++]=
+    CbcOrClpParam("dirNetlib","Set directory where the netlib problems are.",
+                  DIRNETLIB);
+  parameters[numberParameters-1].setLonghelp
+    (
+     "This sets the directory where the netlib problems reside. One can get\
+ the netlib problems from COIN-OR or from the main netlib site. This\
+ parameter is used only when -netlib is passed to clp. clp will pick up the\
+ netlib problems from this directory. If clp is built without zlib support\
+ then the problems must be uncompressed.\
+ It is initialized to '../../Data/Netlib'"
+     ); 
+  parameters[numberParameters++]=
+    CbcOrClpParam("dirMiplib","Set directory where the miplib 2003 problems are.",
+                  DIRMIPLIB);
+  parameters[numberParameters-1].setLonghelp
+    (
+     "This sets the directory where the miplib 2003 problems reside. One can\
+ get the miplib problems from COIN-OR or from the main miplib site. This\
+ parameter is used only when -miplib is passed to cbc. cbc will pick up the\
+ miplib problems from this directory. If cbc is built without zlib support\
+ then the problems must be uncompressed.\
+ It is initialized to '../../Data/miplib3'"
      ); 
 #ifdef COIN_HAS_CLP

branches/BSP/trunk/Clp/src/CbcOrClpParam.hpp

@@ -81 +81 @@
     LANDPCUTS,RINS,RESIDCUTS,
     
-    DIRECTORY=301,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
+    DIRECTORY=301,DIRSAMPLE,DIRNETLIB,DIRMIPLIB,IMPORT,EXPORT,RESTORE,SAVE,DUALSIMPLEX,PRIMALSIMPLEX,EITHERSIMPLEX,
     MAXIMIZE,MINIMIZE,EXIT,STDIN,UNITTEST,NETLIB_EITHER,NETLIB_DUAL,NETLIB_PRIMAL,SOLUTION,SAVESOL,
     TIGHTEN,FAKEBOUND,HELP,PLUSMINUS,NETWORK,ALLSLACK,REVERSE,BARRIER,NETLIB_BARRIER,NETLIB_TUNE,

branches/BSP/trunk/Clp/src/ClpMain.cpp

@@ -97 +97 @@
     models->messageHandler()->setPrefix(false);
     const char dirsep =  CoinFindDirSeparator();
-    std::string directory = (dirsep == '/' ? "./" : ".\\");
+    std::string directory;
+    std::string dirSample;
+    std::string dirNetlib;
+    std::string dirMiplib;
+    if (dirsep == '/') {
+      directory = "./";
+      dirSample = "../../Data/Sample/";
+      dirNetlib = "../../Data/Netlib/";
+      dirMiplib = "../../Data/miplib3/";
+    } else {
+      directory = ".\\";
+      dirSample = "..\\..\\Data\\Sample\\";
+      dirNetlib = "..\\..\\Data\\Netlib\\";
+      dirMiplib = "..\\..\\Data\\miplib3\\";
+    }
     std::string defaultDirectory = directory;
     std::string importFile ="";
@@ -118 +132 @@
     parameters[whichParam(PRINTMASK,numberParameters,parameters)].setStringValue(printMask);
     parameters[whichParam(DIRECTORY,numberParameters,parameters)].setStringValue(directory);
+    parameters[whichParam(DIRSAMPLE,numberParameters,parameters)].setStringValue(dirSample);
+    parameters[whichParam(DIRNETLIB,numberParameters,parameters)].setStringValue(dirNetlib);
+    parameters[whichParam(DIRMIPLIB,numberParameters,parameters)].setStringValue(dirMiplib);
     parameters[whichParam(DUALBOUND,numberParameters,parameters)].setDoubleValue(models->dualBound());
     parameters[whichParam(DUALTOLERANCE,numberParameters,parameters)].setDoubleValue(models->dualTolerance());
@@ -1362 +1379 @@
             }
             break;
+          case DIRSAMPLE:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirSample=name;
+                else
+                  dirSample = name+"/";
+                parameters[iParam].setStringValue(dirSample);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
+          case DIRNETLIB:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirNetlib=name;
+                else
+                  dirNetlib = name+"/";
+                parameters[iParam].setStringValue(dirNetlib);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
+          case DIRMIPLIB:
+            {
+              std::string name = CoinReadGetString(argc,argv);
+              if (name!="EOL") {
+                int length=name.length();
+                if (name[length-1]=='/'||name[length-1]=='\\')
+                  dirMiplib=name;
+                else
+                  dirMiplib = name+"/";
+                parameters[iParam].setStringValue(dirMiplib);
+              } else {
+                parameters[iParam].printString();
+              }
+            }
+            break;
           case STDIN:
             CbcOrClpRead_mode=-1;
@@ -1372 +1434 @@
             {
               // create fields for unitTest
-              const char * fields[3];
-              std::string dirfield;
-              int nFields=2;
+              const char * fields[4];
+              int nFields=4;
               fields[0]="fake main from unitTest";
-              fields[1]="-netlib";
-              if (directory!=defaultDirectory) {
-                dirfield = "-netlibDir=";
-                dirfield += directory.c_str();
-                fields[2]=dirfield.c_str();
-                nFields=3;
-              }
+              std::string mpsfield = "-mpsDir=";
+              mpsfield += dirSample.c_str();
+              fields[1]=mpsfield.c_str();
+              std::string netfield = "-netlibDir=";
+              netfield += dirNetlib.c_str();
+              fields[2]=netfield.c_str();
+              fields[3]="-netlib";
               int algorithm;
               if (type==NETLIB_DUAL) {
@@ -1411 +1472 @@
             {
               // create fields for unitTest
-              const char * fields[3];
-              int nFields=1;
+              const char * fields[2];
+              int nFields=2;
               fields[0]="fake main from unitTest";
+              std::string dirfield = "-mpsDir=";
+              dirfield += dirSample.c_str();
+              fields[1]=dirfield.c_str();
               int specialOptions = models[iModel].specialOptions();
               models[iModel].setSpecialOptions(0);

branches/BSP/trunk/Clp/test/Makefile.am

@@ -15 +15 @@
 # We are using the CLP solver executable to do the unit test
 test: ../src/clp$(EXEEXT)
-        if test x"$(NETLIBDIR)" != x; then \
-                ../src/clp$(EXEEXT) -directory $(NETLIBDIR) -unitTest -netlib; \
-        else \
-                ../src/clp$(EXEEXT) -unitTest; \
-        fi
+        if test x"$(DIRNETLIB)" != x; then \
+                NETLIBARG="-dirNetlib $(DIRNETLIB) -netlib"; \
+        fi; \
+        if test x"$(DIRSAMPLE)" != x; then \
+                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
+        fi; \
+        ../src/clp$(EXEEXT) $$SAMPLEARG -unitTest $$NETLIBARG
 
 .PHONY: test

branches/BSP/trunk/Clp/test/Makefile.in

@@ -371 +371 @@
 # We are using the CLP solver executable to do the unit test
 test: ../src/clp$(EXEEXT)
-        if test x"$(NETLIBDIR)" != x; then \
-                ../src/clp$(EXEEXT) -directory $(NETLIBDIR) -unitTest -netlib; \
-        else \
-                ../src/clp$(EXEEXT) -unitTest; \
-        fi
+        if test x"$(DIRNETLIB)" != x; then \
+                NETLIBARG="-dirNetlib $(DIRNETLIB) -netlib"; \
+        fi; \
+        if test x"$(DIRSAMPLE)" != x; then \
+                SAMPLEARG="-dirSample $(DIRSAMPLE)"; \
+        fi; \
+        ../src/clp$(EXEEXT) $$SAMPLEARG -unitTest $$NETLIBARG
 
 .PHONY: test