Changeset 823 for stable/2.0/Cbc/src/unitTestClp.cpp

Timestamp:

Oct 12, 2007 11:54:25 AM (14 years ago)

Author:

forrest

Message:

for unit test return code

File:

• stable/2.0/Cbc/src/unitTestClp.cpp (modified) (13 diffs)

stable/2.0/Cbc/src/unitTestClp.cpp

@@ -76 +76 @@
 //#############################################################################
 
-void CbcClpUnitTest (const CbcModel & saveModel, std::string& dirMiplib,
+int CbcClpUnitTest (const CbcModel & saveModel, std::string& dirMiplib,
                      bool unitTestOnly)
 {
@@ -88 +88 @@
   if (!doTest) {
     printf("Not doing miplib run as can't find mps files - ? .gz without libz\n");
-    return;
+    return -1;
   }
   /*
@@ -129 +129 @@
 #endif
     PUSH_MPS("air03",124,10757,340160,338864.25,7);
-#if HOWMANY==3
+#if HOWMANY>2
     PUSH_MPS("air04",823,8904,56137,55535.436,8);
     PUSH_MPS("air05",426,7195,26374,25877.609,8);
@@ -148 +148 @@
     PUSH_MPS("egout",98,141,568.101,149.589,7);
     PUSH_MPS("enigma",21,100,0.0,0.0,7);
-#if HOWMANY==3
+#if HOWMANY>3
     PUSH_MPS("fast0507",507,63009,174,172.14556668,7);
 #endif
@@ -164 +164 @@
     PUSH_MPS("gesa3_o",1224,1152,27991042.648,27833632.451,7);
     PUSH_MPS("gt2",29,188,21166.000,13460.233074,7);
-#if HOWMANY==3
+#if HOWMANY>2
     PUSH_MPS("harp2",112,2993,-73899798.00,-74353341.502,7);
 #endif
@@ -180 +180 @@
     PUSH_MPS("mod008",6,319,307,290.9,7);
     PUSH_MPS("mod010",146,2655,6548,6532.08,7);
-#if HOWMANY==3
+#if HOWMANY>2
     PUSH_MPS("mod011",4480,10958,-54558535,-62121982.55,7);
     PUSH_MPS("modglob",291,422,20740508,20430947.,7);
+#endif
+#if HOWMANY>3
     PUSH_MPS("noswot",182,128,-43,-43.0,7);
 #endif
@@ -193 +195 @@
     PUSH_MPS("p0548",176,548,8691,315.29,7);
     PUSH_MPS("p2756",755,2756,3124,2688.75,7);
-#if HOWMANY==3
+#if HOWMANY>2
     PUSH_MPS("pk1",45,86,11.0,0.0,7);
 #endif
@@ -200 +202 @@
     PUSH_MPS("pp08aCUTS",246,240,7350.0,5480.6061563,7);
 #endif
-#if HOWMANY==3
+#if HOWMANY>2
     PUSH_MPS("qiu",1192,840,-132.873137,-931.638857,7);
 #endif
@@ -207 +209 @@
     PUSH_MPS("rentacar",6803,9557,30356761,28806137.644,7);
     PUSH_MPS("rgn",24,180,82.1999,48.7999,7);
-#if HOWMANY==3
+#if HOWMANY>3
     PUSH_MPS("rout",291,556,1077.56,981.86428571,7);
     PUSH_MPS("set1ch",492,712,54537.75,32007.73,7);
@@ -224 +226 @@
   int numProbSolved = 0;
   double timeTaken=0.0;
+  int numberFailures=0;
   
   /*
@@ -364 +367 @@
         std::cout <<"cbc_clp" <<" " <<soln << " != " <<objValue[m]
                   << "; error=" << fabs(objValue[m] - soln); 
+        numberFailures++;
       }
     } else {
@@ -372 +376 @@
     delete model;
   }
+  int returnCode=0;
   std::cout 
     <<"cbc_clp" 
@@ -377 +382 @@
     <<numProbSolved
     <<" out of "
-    <<objValue.size()
-    <<" and took "
+    <<objValue.size();
+  int numberOnNodes = objValue.size()-numProbSolved-numberFailures;
+  if (numberFailures||numberOnNodes) {
+    if (numberOnNodes) {
+      std::cout<<" ("<<numberOnNodes<<" stopped on nodes)";
+      returnCode = numberOnNodes;
+    }
+    if (numberFailures) {
+      std::cout<<" ("<<numberFailures<<" gave bad answer!)";
+      returnCode += 100*numberFailures;
+    }
+  }
+  std::cout<<" and took "
     <<timeTaken
     <<" seconds."
     <<std::endl;
+  return returnCode;
 }