Changeset 748

Timestamp:

Aug 12, 2007 7:06:57 AM (12 years ago)

Author:

stefan

Message:

add unitTestClp.cpp to libCbc to have CbcClpUnitTest? well defined

Location:

branches/BSP/trunk/Cbc

Files:

• configure (modified) (2 diffs)
• src/CbcGeneric.cpp (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (4 diffs)

branches/BSP/trunk/Cbc/configure

@@ -2809 +2809 @@
           xlc* | */xlc* | mpxlc* | */mpxlc*)
             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cflags="-bmaxdata:0x80000000"
+            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036,1500-029"
             coin_dbg_cflags="-g"
           ;;
@@ -3650 +3650 @@
           xlC* | */xlC* | mpxlC* | */mpxlC*)
             coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna"
+            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036,1500-029"
             coin_dbg_cxxflags="-g"
             ;;

branches/BSP/trunk/Cbc/src/CbcGeneric.cpp

@@ -64 +64 @@
 
 }
-
-/*
-  We need a local dummy of this to satisfy libCbc when linking. FIXME: But why
-  only for the optimised build?
-*/
-void CbcClpUnitTest (const CbcModel & saveModel, std::string& miplibDir)
-{ return ; }
 
 namespace CbcGenSolvers

branches/BSP/trunk/Cbc/src/Makefile.am

@@ -48 +48 @@
         CbcLinked.cpp CbcLinked.hpp \
         CbcTreeLocal.cpp CbcTreeLocal.hpp \
-        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp 
+        ClpConstraintAmpl.hpp ClpAmplObjective.hpp ClpAmplStuff.cpp \
+        unitTestClp.cpp
+#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
 
 ## If we have the Ampl solver library, we need to add additional things

branches/BSP/trunk/Cbc/src/Makefile.in

@@ -166 +166 @@
         CbcModel.lo CbcNode.lo CbcSolver.lo CbcCbcParam.lo \
         CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcLinked.lo \
-        CbcTreeLocal.lo ClpAmplStuff.lo Cbc_ampl.lo
+        CbcTreeLocal.lo ClpAmplStuff.lo unitTestClp.lo Cbc_ampl.lo
 libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
 @COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
@@ -478 +478 @@
 
 # List all source files for this library, including headers
+#Stefan: added unitTestClp.cpp because CbcSolver defines reference to it
 libCbc_la_SOURCES = Cbc_C_Interface.cpp Cbc_C_Interface.h CbcConfig.h \
         CbcBranchActual.cpp CbcBranchActual.hpp CbcBranchBase.cpp \
@@ -498 +499 @@
         CbcTree.hpp CbcLinked.cpp CbcLinked.hpp CbcTreeLocal.cpp \
         CbcTreeLocal.hpp ClpConstraintAmpl.hpp ClpAmplObjective.hpp \
-        ClpAmplStuff.cpp Cbc_ampl.cpp Cbc_ampl.h
+        ClpAmplStuff.cpp unitTestClp.cpp Cbc_ampl.cpp Cbc_ampl.h
 
 # This is for libtool (on Windows)
@@ -777 +778 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpAmplStuff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinSolve.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unitTestClp.Po@am__quote@