Changeset 1104:23a54f889272 in lemon-0.x for src/work/marci

Timestamp:

01/28/05 15:33:32 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1503

Message:

small changes, a try for max flow using expression

Location:

src/work/marci/lp

Files:

• lp_solver_wrapper_3.h (modified) (6 diffs)
• makefile (modified) (1 diff)
• max_flow_expression.cc (added)

src/work/marci/lp/lp_solver_wrapper_3.h

@@ -11 +11 @@
 #include <iostream>
 #include <map>
+#include <limits>
 // #include <stdio>
 //#include <stdlib>
@@ -197 +198 @@
     /// \e
     const int INVALID_CLASS;
+    /// \e 
+    static const _Value INF;
   public:
     /// \e
@@ -222 +225 @@
     /// \e
     virtual void _setRowCoeffs(int i, 
-                               std::vector<std::pair<int, double> > coeffs) = 0;
+                               const std::vector<std::pair<int, _Value> >& coeffs) = 0;
     /// \e
     virtual void _setColCoeffs(int i, 
-                               std::vector<std::pair<int, double> > coeffs) = 0;
+                               const std::vector<std::pair<int, _Value> >& coeffs) = 0;
     /// \e
     virtual void _eraseCol(int i) = 0;
@@ -424 +427 @@
   };
   
+  template <typename _Value>
+  const _Value LPSolverBase<_Value>::INF=std::numeric_limits<_Value>::infinity();
+
 
   /// \brief Wrappers for LP solvers
@@ -475 +481 @@
     /// \e
     virtual void _setRowCoeffs(int i, 
-                               std::vector<std::pair<int, double> > coeffs) {
+                               const std::vector<std::pair<int, double> >& coeffs) {
       int mem_length=1+colNum();
       int* indices = new int[mem_length];
@@ -495 +501 @@
     /// \e
     virtual void _setColCoeffs(int i, 
-                               std::vector<std::pair<int, double> > coeffs) {
+                               const std::vector<std::pair<int, double> >& coeffs) {
       int mem_length=1+rowNum();
       int* indices = new int[mem_length];

src/work/marci/lp/makefile

@@ -6 +6 @@
 LDFLAGS  =  -lglpk#-lcplex -lm -lpthread -lilocplex -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_mt# -L$(GLPKROOT)/lib
 
-BINARIES = expression_test max_flow_by_lp# sample sample2 sample11 sample15
+BINARIES = max_flow_expression expression_test max_flow_by_lp# sample sample2 sample11 sample15
 
 #include ../makefile