Changeset 1314:9269c76551cf in lemon-0.x for src

Timestamp:

04/07/05 11:42:31 (19 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

New functions in lp_glpk.cc. Sample file: lp_sample.cc.

Location:

src

Files:

• lemon/lp_glpk.cc (modified) (2 diffs)
• work/athos/lp/Makefile (modified) (1 diff)
• work/athos/makefile (modified) (1 diff)

src/lemon/lp_glpk.cc

@@ -258 +258 @@
   LpGlpk::Value LpGlpk::_getPrimalValue()
   {
-    return 0;
+    return lpx_get_obj_val(lp);
   }
   
@@ -291 +291 @@
   void LpGlpk::_setMax()
   {
-  }
+      lpx_set_obj_dir(lp, LPX_MAX);
+   }
   void LpGlpk::_setMin()
   {
-  }
+      lpx_set_obj_dir(lp, LPX_MIN);
+   }
 
  

src/work/athos/lp/Makefile

@@ -1 +1 @@
 CXXFLAGS = -Wall -ggdb --no-inline -I../../..
 
-all: lp_test
+all: lp_sample
 
 clean:
         rm lp_test *.o
 
-lp_base.o: lp_base.cc lp_base.h lin_expr.h
+lp_base.o: ../../../lemon/lp_base.cc ../../../lemon/lp_base.h lin_expr.h
+
 lp_solver_skeleton.o: lp_solver_skeleton.cc lp_solver_skeleton.h lp_base.h \
                 lin_expr.h
-lp_glpk.o: lp_glpk.cc lp_glpk.h lp_base.h \
-                lin_expr.h
-lp_test.o: lp_test.cc lp_base.h lin_expr.h lp_solver_skeleton.h lp_base.h \
-                lin_expr.h
 
-lp_test: lp_test.o lp_base.o lp_solver_skeleton.o lp_glpk.o
+lp_glpk.o: ../../../lemon/lp_glpk.cc ../../../lemon/lp_glpk.h ../../../lemon/lp_base.h lin_expr.h
+
+
+lp_sample.o: lp_sample.cc 
+
+lp_sample: lp_sample.o lp_base.o lp_glpk.o 
         $(CXX) -o $@ $^ -lglpk
+

src/work/athos/makefile

@@ -1 @@
-BINARIES = bfs_test min_cost_flow
+BINARIES = lp_sample
 INCLUDEDIRS= -I../.. -I.. -I../{athos,klao,marci,jacint,alpar,johanna,akos} 
 include ../makefile