Changeset 306

Timestamp:

Apr 6, 2006 3:49:16 PM (14 years ago)

Author:

lou

Message:

cbc -miplib prints warning when cbc built without OsiCbc?

File:

• trunk/Test/unitTest.cpp (modified) (4 diffs)

trunk/Test/unitTest.cpp

@@ -43 +43 @@
 
 #ifdef CBC_USE_CBC
-void CbcUnitTest (const std::vector<OsiCbcSolverInterface*> & vecEmptySiP,
-                  const std::string & mpsDir)
+void CbcMiplibTest (const std::vector<OsiCbcSolverInterface*> & vecEmptySiP,
+                    const std::string & mpsDir)
 {
   int i ;
@@ -300 +300 @@
   } 
 }
-#endif
+#endif  // CBC_USE_CBC
+
 //----------------------------------------------------------------
 // unitTest  [-miplibDir=V2]
@@ -390 +391 @@
 
     testingMessage( "Testing some miplib stuff\n" );
-    CbcUnitTest(vecSi,miplibDir);
+    CbcMiplibTest(vecSi,miplibDir);
 
     unsigned int i;
@@ -396 +397 @@
       delete vecSi[i];
   }
-#endif
+#else   // CBC_USE_CBC
+  std::cerr
+    << "cbc has been built without OsiCbc support. To enable the -miplib\n"
+    << "option, you must enable libOsiCbc in Makefile.location, then\n"
+    << "execute the command `make clean cbc' to rebuild the cbc program."
+    << std::endl ;
+#endif  // CBC_USE_CBC
   testingMessage( "All tests completed successfully\n" );
   return 0;