Changes in / [1208:c6aa2cc1af04:1209:4a170261cc54] in lemon-main

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/FindILOG.cmake (modified) (1 diff)
• lemon/clp.cc (modified) (2 diffs)
• lemon/clp.h (modified) (1 diff)
• lemon/cplex.cc (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/lp_test.cc (modified) (6 diffs)
• test/mip_test.cc (modified) (4 diffs)

CMakeLists.txt

@@ -6 +6 @@
 
 IF(POLICY CMP0043) 
-  CMAKE_POLICY(SET CMP0043 OLD) 
+  CMAKE_POLICY(SET CMP0043 NEW)
 ENDIF(POLICY CMP0043)
 
 IF(POLICY CMP0026)
   #This is for copying the dll's needed by glpk (in lp_test and mip_test)
-  CMAKE_POLICY(SET CMP0026 OLD) 
+  CMAKE_POLICY(SET CMP0026 NEW)
 ENDIF(POLICY CMP0026)
 
@@ -197 +197 @@
 
 IF(MSVC)
-  SET(CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
+  SET( CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}")
   SET( CMAKE_CXX_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
-    "Flags used by the C++ compiler during maintainer builds."
+    "Flags used by the C++ compiler during maintainer builds." FORCE
     )
   SET( CMAKE_C_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING
-    "Flags used by the C compiler during maintainer builds."
+    "Flags used by the C compiler during maintainer builds." FORCE
     )
   SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
     "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
-    "Flags used for linking binaries during maintainer builds."
+    "Flags used for linking binaries during maintainer builds." FORCE
     )
   SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
     "Flags used by the shared libraries linker during maintainer builds."
+     FORCE
     )
 ELSE()
   SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb -O0" CACHE STRING
-    "Flags used by the C++ compiler during maintainer builds."
+    "Flags used by the C++ compiler during maintainer builds." FORCE
     )
   SET( CMAKE_C_FLAGS_MAINTAINER "-Werror -O0" CACHE STRING
-    "Flags used by the C compiler during maintainer builds."
+    "Flags used by the C compiler during maintainer builds." FORCE
     )
   SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER
     "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
-    "Flags used for linking binaries during maintainer builds."
+    "Flags used for linking binaries during maintainer builds." FORCE
     )
   SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER
     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
-    "Flags used by the shared libraries linker during maintainer builds."
-    )
+    "Flags used by the shared libraries linker during maintainer builds." FORCE)
 ENDIF()
 
@@ -252 +252 @@
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES
-  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
-  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
+  COMPILE_DEFINITIONS
+  $<$<OR:$<CONFIG:Debug>,$<CONFIG:Maintainer>>:LEMON_ENABLE_DEBUG>
 )
 

cmake/FindILOG.cmake

@@ -97 +97 @@
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     # SET(CPLEX_LIBRARIES "${CPLEX_LIBRARIES};m;pthread")
-    SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread")
+    SET(ILOG_LIBRARIES ${ILOG_LIBRARIES} "m" "pthread" "dl")
   ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 ENDIF(ILOG_FOUND)

lemon/clp.cc

@@ -228 +228 @@
 
   ClpLp::Value ClpLp::_getCoeff(int ix, int jx) const {
-    CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[ix];
-    CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[ix];
+    CoinBigIndex begin = _prob->clpMatrix()->getVectorStarts()[jx];
+    CoinBigIndex end = begin + _prob->clpMatrix()->getVectorLengths()[jx];
 
     const int* indices = _prob->clpMatrix()->getIndices();
     const double* elements = _prob->clpMatrix()->getElements();
 
-    const int* it = std::lower_bound(indices + begin, indices + end, jx);
-    if (it != indices + end && *it == jx) {
+    const int* it = std::lower_bound(indices + begin, indices + end, ix);
+    if (it != indices + end && *it == ix) {
       return elements[it - indices];
     } else {
@@ -462 +462 @@
   }
 
+   void ClpLp::_write(std::string file, std::string format) const
+  {
+    if(format == "LP")
+      _prob->writeLp(file.c_str(), "", 1e-5, 10, 5,
+                     sense()==ClpLp::MIN?1:-1,
+                     true
+                     );
+    else throw UnsupportedFormatError(format);
+  }
+ 
 } //END OF NAMESPACE LEMON

lemon/clp.h

@@ -140 +140 @@
     virtual void _messageLevel(MessageLevel);
 
+    void _write(std::string file, std::string format) const;
+
   public:
 

lemon/cplex.cc

@@ -159 +159 @@
       const char s = 'R';
       double len = ub - lb;
-      CPXaddrows(cplexEnv(), _prob, 0, 1, values.size(), &ub, &s,
+      CPXaddrows(cplexEnv(), _prob, 0, 1, values.size(), &lb, &s,
                  &rmatbeg, &indices.front(), &values.front(), 0, 0);
       CPXchgrngval(cplexEnv(), _prob, 1, &i, &len);

test/CMakeLists.txt

@@ -85 +85 @@
 
   IF(WIN32 AND LEMON_HAVE_GLPK)
-    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
-    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
     ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
-      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
-      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll $<TARGET_FILE_DIR:lp_test>
+      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll $<TARGET_FILE_DIR:lp_test>
+      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll $<TARGET_FILE_DIR:lp_test>
     )
   ENDIF()

test/lp_test.cc

@@ -340 +340 @@
   check(lp.sense() == lp.MAX,"This is a maximization!");
   check(lp.coeff(upright,x1)==1,"The coefficient in question is 1!");
+  check(lp.coeff(upright,x2)==2,"The coefficient in question is 1!");
   check(lp.colLowerBound(x1)==0,
         "The lower bound for variable x1 should be 0.");
@@ -425 +426 @@
 }
 
+template<class LP>
+void rangeConstraintTest()
+{
+  LP lp;
+  // Add two columns (variables) to the problem
+  typename LP::Col x1 = lp.addCol();
+  typename LP::Col x2 = lp.addCol();
+  // Add rows (constraints) to the problem
+  lp.addRow(x1 - 5 <= x2);
+    lp.addRow(0 <= 2 * x1 + x2 <= 25);
+  
+  // Set lower and upper bounds for the columns (variables)
+  lp.colLowerBound(x1, 0);
+  lp.colUpperBound(x2, 10);
+  
+  // Specify the objective function
+  lp.max();
+  lp.obj(5 * x1 + 3 * x2);
+  
+  // Solve the problem using the underlying LP solver
+  lp.solve();
+  // Print the results
+  check(lp.primalType() == LP::OPTIMAL, "Optimal solution is not found");
+  check(lp.primal() <= 67.501 && lp.primal() >= 67.499, "Wrong objective value");
+  check(lp.primal(x1) <= 7.501 && lp.primal(x1) >= 7.499, "Wrong value for x1");
+  check(lp.primal(x2) <= 10.001 && lp.primal(x2) >= 9.999, "Wrong value for x2");
+}
+
 int main()
 {
@@ -445 +474 @@
     aTest(lp_glpk2);
     cloneTest<GlpkLp>();
+    rangeConstraintTest<GlpkLp>();
   }
 #endif
@@ -454 +484 @@
     aTest(lp_cplex2);
     cloneTest<CplexLp>();
+    rangeConstraintTest<CplexLp>();
   } catch (CplexEnv::LicenseError& error) {
     check(false, error.what());
@@ -465 +496 @@
     aTest(lp_soplex2);
     cloneTest<SoplexLp>();
+    rangeConstraintTest<Soplex>();
   }
 #endif
@@ -474 +506 @@
     aTest(lp_clp2);
     cloneTest<ClpLp>();
+    rangeConstraintTest<ClpLp>();
   }
 #endif

test/mip_test.cc

@@ -62 +62 @@
 }
 
-void aTest(MipSolver& mip)
+void aTest(MipSolver& mip, bool solve_empty=true)
 {
   //The following example is very simple
@@ -81 +81 @@
 
   //Unconstrained optimization
-  mip.solve();
+  if(solve_empty)
+    mip.solve();
   //Check it out!
 
@@ -136 +137 @@
   {
     Mip mip1;
+#if LEMON_DEFAULT_MIP==LEMON_CBC_
+    aTest(mip1, false);
+#else
     aTest(mip1);
+#endif
     cloneTest<Mip>();
   }
@@ -162 +167 @@
   {
     CbcMip mip1;
-    aTest(mip1);
+    aTest(mip1, false);
     cloneTest<CbcMip>();
   }