# HG changeset patch # User athos # Date 1112866951 0 # Node ID 9269c76551cfe2618dae2c6226593ddf77b022df # Parent 96b74270c3a113071cf25f40915fa1d86169d6dc New functions in lp_glpk.cc. Sample file: lp_sample.cc. diff -r 96b74270c3a1 -r 9269c76551cf src/lemon/lp_glpk.cc --- a/src/lemon/lp_glpk.cc Thu Apr 07 06:38:56 2005 +0000 +++ b/src/lemon/lp_glpk.cc Thu Apr 07 09:42:31 2005 +0000 @@ -257,7 +257,7 @@ LpGlpk::Value LpGlpk::_getPrimalValue() { - return 0; + return lpx_get_obj_val(lp); } @@ -290,10 +290,12 @@ void LpGlpk::_setMax() { - } + lpx_set_obj_dir(lp, LPX_MAX); + } void LpGlpk::_setMin() { - } + lpx_set_obj_dir(lp, LPX_MIN); + } } //END OF NAMESPACE LEMON diff -r 96b74270c3a1 -r 9269c76551cf src/work/athos/lp/Makefile --- a/src/work/athos/lp/Makefile Thu Apr 07 06:38:56 2005 +0000 +++ b/src/work/athos/lp/Makefile Thu Apr 07 09:42:31 2005 +0000 @@ -1,17 +1,20 @@ 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 - $(CXX) -o $@ $^ -lglpk \ No newline at end of file +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 + diff -r 96b74270c3a1 -r 9269c76551cf src/work/athos/makefile --- a/src/work/athos/makefile Thu Apr 07 06:38:56 2005 +0000 +++ b/src/work/athos/makefile Thu Apr 07 09:42:31 2005 +0000 @@ -1,4 +1,4 @@ -BINARIES = bfs_test min_cost_flow +BINARIES = lp_sample INCLUDEDIRS= -I../.. -I.. -I../{athos,klao,marci,jacint,alpar,johanna,akos} include ../makefile