Changeset 2016

Timestamp:

Mar 10, 2014 5:58:20 PM (6 years ago)

Author:

mlubin

Message:

More C interface work. Move C interface to libCbcSolver so that we can use CbcMain0 and CbcMain1.

Location:

trunk/Cbc

Files:

• src/Cbc_C_Interface.cpp (modified) (3 diffs)
• src/Cbc_C_Interface.h (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (4 diffs)
• test/CInterfaceTest.c (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)
• test/Makefile.in (modified) (1 diff)

trunk/Cbc/src/Cbc_C_Interface.cpp

@@ -232 +232 @@
     model->solver_->OsiClpSolverInterface::setHintParam(OsiDoReducePrint, true, OsiHintTry);
     model->model_     = new CbcModel(solver1);
+    CbcMain0(*model->model_);
     model->handler_   = NULL;
     model->information_ = NULL;
@@ -310 +311 @@
     fflush(stdout);
 
-    if (1) {
-        solver->loadProblem(numcols, numrows, start, index, value,
-                            collb, colub, obj, rowlb, rowub);
-    } else {
-        solver->loadProblem(0, 0, NULL, NULL, NULL,
-                            NULL, NULL, NULL, NULL, NULL);
-    }
+    solver->loadProblem(numcols, numrows, start, index, value,
+                        collb, colub, obj, rowlb, rowub);
     if (VERBOSE > 1) printf("%s Finished solver->loadProblem()\n", prefix);
     fflush(stdout);
@@ -1479 +1475 @@
 
     if (VERBOSE > 0) printf("%s return %i\n", prefix, result);
+    return result;
+}
+COINLIBAPI int COINLINKAGE
+Cbc_solve(Cbc_Model * model)
+{
+    const char prefix[] = "Cbc_C_Interface::Cbc_solve(): ";
+    int result = 0;
+    const char *argv[] = {"Cbc_C_Interface","-solve", "-quit"};
+    try {
+        
+        CbcMain1(3, argv, *model->model_);
+    } catch (CoinError e) {
+        printf("%s ERROR: %s::%s, %s\n", prefix,
+               e.className().c_str(), e.methodName().c_str(), e.message().c_str());
+    }
+    result = model->model_->status();
+
     return result;
 }

trunk/Cbc/src/Cbc_C_Interface.h

@@ -400 +400 @@
     Cbc_branchAndBound(Cbc_Model * model)
     ;
+    /* Solve using CbcMain1. This is the recommended default solve function.
+    */
+    COINLIBAPI int COINLINKAGE
+    Cbc_solve(Cbc_Model * model)
+    ;
     /** Sets or unsets scaling, 0 -off, 1 equilibrium, 2 geometric, 3, auto, 4 dynamic(later) */
     COINLIBAPI void COINLINKAGE

trunk/Cbc/src/Makefile.am

@@ -19 +19 @@
 # List all source files for this library, including headers
 libCbc_la_SOURCES = \
-        Cbc_C_Interface.cpp Cbc_C_Interface.h \
         CbcConfig.h \
         CbcBranchActual.hpp \
@@ -94 +93 @@
 
 libCbcSolver_la_SOURCES = \
+        Cbc_C_Interface.cpp Cbc_C_Interface.h \
         CbcCbcParam.cpp \
         Cbc_ampl.cpp Cbc_ampl.h \

trunk/Cbc/src/Makefile.in

@@ -92 +92 @@
 @DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES =  \
 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
-am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
-        CbcBranchCut.lo CbcBranchDecision.lo \
-        CbcBranchDefaultDecision.lo CbcBranchDynamic.lo \
-        CbcBranchingObject.lo CbcBranchLotsize.lo \
+am_libCbc_la_OBJECTS = CbcBranchAllDifferent.lo CbcBranchCut.lo \
+        CbcBranchDecision.lo CbcBranchDefaultDecision.lo \
+        CbcBranchDynamic.lo CbcBranchingObject.lo CbcBranchLotsize.lo \
         CbcBranchToFixLots.lo CbcCompareDefault.lo CbcCompareDepth.lo \
         CbcCompareEstimate.lo CbcCompareObjective.lo CbcConsequence.lo \
@@ -121 +120 @@
 @DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES =  \
 @DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libCbc.la
-am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
-        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
-        CbcSolverHeuristics.lo CbcSolverAnalyze.lo CbcMipStartIO.lo \
-        CbcSolverExpandKnapsack.lo
+am_libCbcSolver_la_OBJECTS = Cbc_C_Interface.lo CbcCbcParam.lo \
+        Cbc_ampl.lo CbcLinked.lo CbcLinkedUtils.lo unitTestClp.lo \
+        CbcSolver.lo CbcSolverHeuristics.lo CbcSolverAnalyze.lo \
+        CbcMipStartIO.lo CbcSolverExpandKnapsack.lo
 libCbcSolver_la_OBJECTS = $(am_libCbcSolver_la_OBJECTS)
 @COIN_HAS_CLP_TRUE@am__EXEEXT_1 = cbc$(EXEEXT)
@@ -514 +513 @@
 # List all source files for this library, including headers
 libCbc_la_SOURCES = \
-        Cbc_C_Interface.cpp Cbc_C_Interface.h \
         CbcConfig.h \
         CbcBranchActual.hpp \
@@ -589 +587 @@
 
 libCbcSolver_la_SOURCES = \
+        Cbc_C_Interface.cpp Cbc_C_Interface.h \
         CbcCbcParam.cpp \
         Cbc_ampl.cpp Cbc_ampl.h \

trunk/Cbc/test/CInterfaceTest.c

@@ -4 +4 @@
    This code is licensed under the terms of the Eclipse Public License (EPL). */
 
+#undef NDEBUG /* force asserts to work */
 #include "Cbc_C_Interface.h"
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
+
 
 void testKnapsack() {
@@ -46 +48 @@
     assert(Cbc_optimizationDirection(model) == 1);
 
-    Cbc_branchAndBound(model);
+    Cbc_solve(model);
 
     assert(Cbc_isProvenOptimal(model));
-    assert(abs( Cbc_objectiveValue(model)- (-16.0) < 1e-6));
+    assert(fabs( Cbc_objectiveValue(model)- (-16.0) < 1e-6));
     
     sol = Cbc_getColSolution(model);
@@ -61 +63 @@
 }
 
+void testIntegerInfeasible() {
+
+    Cbc_Model *model = Cbc_newModel();
+
+    /* Minimize x
+     * s.t.     x <= -10
+     * x binary */
+
+    CoinBigIndex start[] = {0, 1};
+    int rowindex[] = {0};
+    double value[] = {1.0};
+    double rowlb[] = {-INFINITY};
+    double rowub[] = {-10};
+
+    double collb[] = {0.0};
+    double colub[] = {1.0};
+    double obj[] = {1.0};
+    char integer[] = {1};
+
+    Cbc_loadProblem(model, 1, 1, start, rowindex, value, collb, colub, obj, rowlb, rowub);
+
+    Cbc_copyInIntegerInformation(model, integer);
+
+    assert(Cbc_getNumCols(model) == 1);
+    assert(Cbc_getNumRows(model) == 1);
+
+    Cbc_solve(model);
+    
+    assert(!Cbc_isProvenOptimal(model));
+    assert(Cbc_isProvenPrimalInfeasible(model));
+
+}
+
+void testIntegerUnbounded() {
+
+    Cbc_Model *model = Cbc_newModel();
+
+    /* http://list.coin-or.org/pipermail/cbc/2014-March/001276.html
+     * Minimize x
+     * s.t. x + y <= 3
+     *      x - y == 0
+     *      x,y Free
+     *      x integer */
+
+    CoinBigIndex start[] = {0,2,4};
+    int rowindex[] = {0, 1, 0, 1};
+    double value[] = {1, 1, 1, -1};
+    double rowlb[] = {-INFINITY, 0.0};
+    double rowub[] = {3.0,0.0};
+    double collb[] = {-INFINITY, -INFINITY};
+    double colub[] = {INFINITY, INFINITY};
+    double obj[] = {1.0};
+    char integer[] = {1,0};
+
+    Cbc_loadProblem(model, 2, 2, start, rowindex, value, collb, colub, obj, rowlb, rowub);
+
+    Cbc_copyInIntegerInformation(model, integer);
+
+    Cbc_solve(model);
+    
+    assert(!Cbc_isProvenOptimal(model));
+    assert(!Cbc_isProvenPrimalInfeasible(model));
+    assert(Cbc_isProvenDualInfeasible(model));
+
+
+
+}
+
+
 int main() {
 
     testKnapsack();
+    testIntegerInfeasible();
+    testIntegerUnbounded();
 
     return 0;

trunk/Cbc/test/Makefile.am

@@ -92 +92 @@
 CInterfaceTest_SOURCES = CInterfaceTest.c
 
-CInterfaceTest_LDADD = ../src/libCbc.la $(CBCLIB_LIBS)
+CInterfaceTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
 
-CInterfaceTest_DEPENDENCIES = ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
+CInterfaceTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
 
 ctests: CInterfaceTest$(EXEEXT)

trunk/Cbc/test/Makefile.in

@@ -454 +454 @@
 ########################################################################
 CInterfaceTest_SOURCES = CInterfaceTest.c
-CInterfaceTest_LDADD = ../src/libCbc.la $(CBCLIB_LIBS)
-CInterfaceTest_DEPENDENCIES = ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
+CInterfaceTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
+CInterfaceTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
 
 ########################################################################