Changeset 713 for trunk

Timestamp:

Jul 27, 2007 6:15:07 PM (14 years ago)

Author:

jpfasano

Message:

Changes to get Cbc/examples/cbc_driverC_sos.c to build and run

Location:

trunk/Cbc

Files:

• MSVisualStudio/v8/cbcCSosDllSample/cbcCSosDllSample.vcproj (modified) (4 diffs)
• examples/cbc_driverC_sos.c (modified) (1 diff)
• src/Cbc_C_Interface.cpp (modified) (1 diff)

trunk/Cbc/MSVisualStudio/v8/cbcCSosDllSample/cbcCSosDllSample.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CBCCINTERFACEDLL_EXPORTS"
+                                PreprocessorDefinitions="WIN32;_NDEBUG;_CONSOLE;CBCCINTERFACEDLL_EXPORTS"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -64 +64 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                AdditionalDependencies="cbcCInterfaceDll.lib"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories=""
+                                AdditionalLibraryDirectories="$(SolutionDir)cbcCInterfaceDll\Debug"
                                 DelayLoadDLLs=""
                                 GenerateDebugInformation="true"
@@ -122 +123 @@
                         <Tool
                                 Name="VCCLCompilerTool"
+                                Optimization="2"
                                 AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CBCCINTERFACEDLL_EXPORTS"
@@ -143 +145 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                AdditionalDependencies="cbcCInterfaceDll.lib"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories=""
+                                AdditionalLibraryDirectories="$(SolutionDir)cbcCInterfaceDll\Release"
                                 DelayLoadDLLs=""
                                 GenerateDebugInformation="true"

trunk/Cbc/examples/cbc_driverC_sos.c

@@ -70 +70 @@
   // Keep names when reading an mps file 
   if (argc<2)
-    //    status=Cbc_readMps(model,"../../../../../Data/Sample/ltw.mps");
-    status=Cbc_readMps(model,"../../Data/Sample/p0033.mps");
+    // status=Cbc_readMps(model,"../../../../../Data/Sample/ltw.mps");
+    status=Cbc_readMps(model,"../../../../../Data/Sample/p0033.mps");
   else
     status=Cbc_readMps(model,argv[1]);

trunk/Cbc/src/Cbc_C_Interface.cpp

@@ -155 +155 @@
     int i;
     int nDouble=numberDoubleFields();
-    assert (nDouble<=10);
-    double vDouble[10];
+    assert (nDouble<=20);
+    double vDouble[20];
     for (i=0;i<nDouble;i++)
       vDouble[i]=doubleValue(i);
     int nInt=numberIntFields();
-    assert (nInt<=10);
-    int vInt[10];
+    assert (nInt<=20);
+    int vInt[20];
     for (i=0;i<nInt;i++)
       vInt[i]=intValue(i);
     int nString=numberStringFields();
-    assert (nString<=10);
-    char * vString[10];
+    assert (nString<=20);
+    char * vString[20];
     for (i=0;i<nString;i++) {
       std::string value = stringValue(i);