Changeset 1153:4b0468de3a31 in lemon-0.x for src/work/marci

Timestamp:

02/17/05 16:14:13 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

if you have a nuclear power plant and wanna compute small magic squares, then let's do it

Location:

src/work/marci/lp

Files:

• lp_solver_base.h (modified) (3 diffs)
• magic_square.cc (added)
• makefile (modified) (1 diff)

src/work/marci/lp/lp_solver_base.h

@@ -620 +620 @@
     /// \e
     virtual void _setColInt(int i) = 0;
+    /// \e
+    virtual _Value _getMIPPrimal(int i) = 0;
   public:
     /// \e
@@ -628 +630 @@
     void setColInt(Col col) {
       _setColInt(col_iter_map[col]);
+    }
+    /// \e
+    _Value getMIPPrimal(Col col) {
+      return _getMIPPrimal(col_iter_map[col]);
     }
     //@}
@@ -1097 +1103 @@
   protected:
     /// \e
-    void _setColCont(int i) {lpx_set_col_kind(lp, i, LPX_CV); }
-    /// \e
-    void _setColInt(int i) {lpx_set_col_kind(lp, i, LPX_IV); }
+    void _setColCont(int i) { lpx_set_col_kind(lp, i, LPX_CV); }
+    /// \e
+    void _setColInt(int i) { lpx_set_col_kind(lp, i, LPX_IV); }
+    /// \e
+    double _getMIPPrimal(int i) { return lpx_mip_col_val(lp, i); }
   };
   

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 = max_flow_expression expression_test max_flow_by_lp# sample sample2 sample11 sample15
+BINARIES = magic_square max_flow_expression expression_test max_flow_by_lp# sample sample2 sample11 sample15
 
 #include ../makefile