[Lemon-commits] [lemon_svn] athos: r1753 - in hugo/trunk/src: lemon work/athos work/athos/lp

[Lemon SVN]

Author: athos
Date: Thu Apr  7 11:42:31 2005
New Revision: 1753

Modified:
   hugo/trunk/src/lemon/lp_glpk.cc
   hugo/trunk/src/work/athos/lp/Makefile
   hugo/trunk/src/work/athos/makefile

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

Modified: hugo/trunk/src/lemon/lp_glpk.cc
==============================================================================
--- hugo/trunk/src/lemon/lp_glpk.cc	(original)
+++ hugo/trunk/src/lemon/lp_glpk.cc	Thu Apr  7 11:42:31 2005
@@ -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

Modified: hugo/trunk/src/work/athos/lp/Makefile
==============================================================================
--- hugo/trunk/src/work/athos/lp/Makefile	(original)
+++ hugo/trunk/src/work/athos/lp/Makefile	Thu Apr  7 11:42:31 2005
@@ -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
+

Modified: hugo/trunk/src/work/athos/makefile
==============================================================================
--- hugo/trunk/src/work/athos/makefile	(original)
+++ hugo/trunk/src/work/athos/makefile	Thu Apr  7 11:42:31 2005
@@ -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