Changeset 1745

Timestamp:

Jun 13, 2011 11:09:00 AM (9 years ago)

Author:

stefan

Message:

remove now redundant counting of test failures; a bit more cleanup

Location:

trunk/Clp

Files:

• src/OsiClp/OsiClpSolverInterface.hpp (modified) (2 diffs)
• test/OsiClpSolverInterfaceTest.cpp (modified) (9 diffs)
• test/osiUnitTest.cpp (modified) (2 diffs)

trunk/Clp/src/OsiClp/OsiClpSolverInterface.hpp

@@ -38 +38 @@
 class OsiClpSolverInterface :
   virtual public OsiSolverInterface {
-  friend int OsiClpSolverInterfaceUnitTest(const std::string & mpsDir, const std::string & netlibDir);
+  friend void OsiClpSolverInterfaceUnitTest(const std::string & mpsDir, const std::string & netlibDir);
   
 public:
@@ -1480 +1480 @@
 bool OsiClpHasNDEBUG();
 //#############################################################################
-/** A function that tests the methods in the OsiClpSolverInterface class. The
-    only reason for it not to be a member method is that this way it doesn't
-    have to be compiled into the library. And that's a gain, because the
-    library should be compiled with optimization on, but this method should be
-    compiled with debugging. Also, if this method is compiled with
-    optimization, the compilation takes 10-15 minutes and the machine pages
-    (has 256M core memory!)... */
-int
-OsiClpSolverInterfaceUnitTest(const std::string & mpsDir, const std::string & netlibDir);
+/** A function that tests the methods in the OsiClpSolverInterface class. */
+void OsiClpSolverInterfaceUnitTest(const std::string & mpsDir, const std::string & netlibDir);
 #endif

trunk/Clp/test/OsiClpSolverInterfaceTest.cpp

@@ -5 +5 @@
 
 #include "CoinPragma.hpp"
-#include "OsiConfig.h"
 
 //#include <cassert>
@@ -13 +12 @@
 
 #include "OsiClpSolverInterface.hpp"
+#include "OsiUnitTests.hpp"
 #include "OsiCuts.hpp"
 #include "OsiRowCut.hpp"
 #include "OsiColCut.hpp"
-#include "OsiUnitTests.hpp"
 #include "CoinMessage.hpp"
 #include "ClpMessage.hpp"
@@ -48 +47 @@
 //--------------------------------------------------------------------------
 // test EKKsolution methods.
-int
+void
 OsiClpSolverInterfaceUnitTest(const std::string & mpsDir, const std::string & netlibDir)
 {
-
   // Test default constructor
   {
@@ -174 +172 @@
       const double * rl = clpSi.getRowLower();
       const double * ru = clpSi.getRowUpper();
-      OSIUNITTEST_ASSERT_ERROR(nc == 8, return 1, "clp", "read and copy exmip1");
-      OSIUNITTEST_ASSERT_ERROR(nr == 5, return 1, "clp", "read and copy exmip1");
+      OSIUNITTEST_ASSERT_ERROR(nc == 8, return, "clp", "read and copy exmip1");
+      OSIUNITTEST_ASSERT_ERROR(nr == 5, return, "clp", "read and copy exmip1");
       OSIUNITTEST_ASSERT_ERROR(eq(cl[0],2.5), {}, "clp", "read and copy exmip1");
       OSIUNITTEST_ASSERT_ERROR(eq(cl[1],0.0), {}, "clp", "read and copy exmip1");
@@ -215 +213 @@
       const CoinPackedMatrix * smP = si.getMatrixByRow();
 
-      OSIUNITTEST_ASSERT_ERROR(smP->getMajorDim()    ==  5, return 1, "clp", "getMatrixByRow: major dim");
-      OSIUNITTEST_ASSERT_ERROR(smP->getNumElements() == 14, return 1, "clp", "getMatrixByRow: num elements");
+      OSIUNITTEST_ASSERT_ERROR(smP->getMajorDim()    ==  5, return, "clp", "getMatrixByRow: major dim");
+      OSIUNITTEST_ASSERT_ERROR(smP->getNumElements() == 14, return, "clp", "getMatrixByRow: num elements");
 
       CoinRelFltEq eq;
@@ -338 +336 @@
     // Test matrixByCol method
     {
-  
       const OsiClpSolverInterface si(m);
       const CoinPackedMatrix * smP = si.getMatrixByCol();
       
-      OSIUNITTEST_ASSERT_ERROR(smP->getMajorDim()    ==  8, return 1, "clp", "getMatrixByCol: major dim");
-      OSIUNITTEST_ASSERT_ERROR(smP->getMinorDim()    ==  5, return 1, "clp", "getMatrixByCol: minor dim");
-      OSIUNITTEST_ASSERT_ERROR(smP->getNumElements() == 14, return 1, "clp", "getMatrixByCol: number of elements");
-      OSIUNITTEST_ASSERT_ERROR(smP->getSizeVectorStarts() == 9, return 1, "clp", "getMatrixByCol: vector starts size");
+      OSIUNITTEST_ASSERT_ERROR(smP->getMajorDim()    ==  8, return, "clp", "getMatrixByCol: major dim");
+      OSIUNITTEST_ASSERT_ERROR(smP->getMinorDim()    ==  5, return, "clp", "getMatrixByCol: minor dim");
+      OSIUNITTEST_ASSERT_ERROR(smP->getNumElements() == 14, return, "clp", "getMatrixByCol: number of elements");
+      OSIUNITTEST_ASSERT_ERROR(smP->getSizeVectorStarts() == 9, return, "clp", "getMatrixByCol: vector starts size");
 
       CoinRelFltEq eq;
@@ -426 +423 @@
         const CoinPackedMatrix * siC1mbr = siC1.getMatrixByRow();
         OSIUNITTEST_ASSERT_ERROR(siC1mbr != NULL, {}, "clp", "matrix by row");
-        OSIUNITTEST_ASSERT_ERROR(siC1mbr->getMajorDim()    ==  5, return 1, "clp", "matrix by row: major dim");
-        OSIUNITTEST_ASSERT_ERROR(siC1mbr->getNumElements() == 14, return 1, "clp", "matrix by row: num elements");
+        OSIUNITTEST_ASSERT_ERROR(siC1mbr->getMajorDim()    ==  5, return, "clp", "matrix by row: major dim");
+        OSIUNITTEST_ASSERT_ERROR(siC1mbr->getNumElements() == 14, return, "clp", "matrix by row: num elements");
 
         const double * ev = siC1mbr->getElements();
@@ -545 +542 @@
       const CoinPackedMatrix * lhsmbr = lhs.getMatrixByRow();
       OSIUNITTEST_ASSERT_ERROR(lhsmbr != NULL, {}, "clp", "matrix by row after assignment");
-      OSIUNITTEST_ASSERT_ERROR(lhsmbr->getMajorDim()    ==  6, return 1, "clp", "matrix by row after assignment: major dim");
-      OSIUNITTEST_ASSERT_ERROR(lhsmbr->getNumElements() == 14, return 1, "clp", "matrix by row after assignment: num elements");
+      OSIUNITTEST_ASSERT_ERROR(lhsmbr->getMajorDim()    ==  6, return, "clp", "matrix by row after assignment: major dim");
+      OSIUNITTEST_ASSERT_ERROR(lhsmbr->getNumElements() == 14, return, "clp", "matrix by row after assignment: num elements");
 
       const double * ev = lhsmbr->getElements();
@@ -1397 +1394 @@
   {
     OsiClpSolverInterface m;
-    return OsiSolverInterfaceCommonUnitTest(&m, mpsDir, netlibDir);
+    OsiSolverInterfaceCommonUnitTest(&m, mpsDir, netlibDir);
   }
 }

trunk/Clp/test/osiUnitTest.cpp

@@ -5 +5 @@
 
 #include "CoinPragma.hpp"
-#include "OsiConfig.h"
 
-#include <cstdio>
 #include <iostream>
 
 #include "OsiUnitTests.hpp"
-#include "OsiRowCutDebugger.hpp"
-#include "OsiRowCut.hpp"
-#include "OsiColCut.hpp"
-
-#include "CoinError.hpp"
-
 #include "OsiClpSolverInterface.hpp"
 
@@ -30 +22 @@
   Start off with various bits of initialisation that don't really belong
   anywhere else.
- */
-  outcomes.clear();
-/*
+
   Synchronise C++ stream i/o with C stdio. This makes debugging
   output a bit more comprehensible. It still suffers from interleave of cout