[Lemon-commits] [lemon_svn] athos: r1778 - hugo/trunk/src/work/athos/lp

[Lemon SVN]

Author: athos
Date: Mon Apr 11 17:46:14 2005
New Revision: 1778

Modified:
   hugo/trunk/src/work/athos/lp/Makefile
   hugo/trunk/src/work/athos/lp/lp_cplex.cc
   hugo/trunk/src/work/athos/lp/lp_cplex.h

Log:
A little has been done. Some important questions arised.

Modified: hugo/trunk/src/work/athos/lp/Makefile
==============================================================================
--- hugo/trunk/src/work/athos/lp/Makefile	(original)
+++ hugo/trunk/src/work/athos/lp/Makefile	Mon Apr 11 17:46:14 2005
@@ -1,9 +1,9 @@
-CXXFLAGS = -Wall -ggdb --no-inline -I../../.. -I..
+CXXFLAGS = -Wall -ggdb --no-inline -I../../.. -I.. -I/usr/local/cplex/cplex75/include
 
 all: lp_sample_cplex
 
 clean:
-	rm lp_test *.o
+	rm lp_test lp_sample_cplex lp_sample *.o
 
 lp_base.o: ../../../lemon/lp_base.cc ../../../lemon/lp_base.h 
 	$(CXX) $(CXXFLAGS) -o $@ -c $<
@@ -23,5 +23,7 @@
 lp_sample: lp_sample.o lp_base.o lp_glpk.o 
 	$(CXX) -o $@ $^ -lglpk
 
-lp_sample_cplex: lp_sample_cplex.o lp_base.o lp_glpk.o 
-	$(CXX) $(CXXFLAGS) -I/usr/local/cplex/cplex75/include -o $@ $^ -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_pic_mt -lcplex -lm -lpthread
+lp_sample_cplex: lp_sample_cplex.o lp_base.o lp_cplex.o 
+	$(CXX) $(CXXFLAGS)  -o $@ $^ -L/usr/local/cplex/cplex75/lib/i86_linux2_glibc2.2_gcc3.0/static_pic_mt -lcplex -lm -lpthread
+
+#	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ 

Modified: hugo/trunk/src/work/athos/lp/lp_cplex.cc
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_cplex.cc	(original)
+++ hugo/trunk/src/work/athos/lp/lp_cplex.cc	Mon Apr 11 17:46:14 2005
@@ -109,7 +109,26 @@
   void LpCplex::_setRowUpperBound(int i, Value value)
   {
     //TODO Ezt kell meg megirni
-    //    Value lo=CPX
+    //type of the problem
+    char sense[1];
+    status = CPXgetsense (env, lp, sense, i, i);
+    Value rhs[1];
+    status = CPXgetrhs (env, lp, rhs, i, i);
+
+    switch (sense[0]) {
+    case 'L'://<= constraint
+      break;
+    case 'E'://= constraint
+      break;
+    case 'G'://>= constraint
+      break;
+    case 'R'://ranged constraint
+      break;
+    default: ;
+      //FIXME error
+    }
+
+    status = CPXchgcoef (env, lp, i, -2, value_rng);
   }
   
   void LpCplex::_setObjCoeff(int i, Value obj_coef)

Modified: hugo/trunk/src/work/athos/lp/lp_cplex.h
==============================================================================
--- hugo/trunk/src/work/athos/lp/lp_cplex.h	(original)
+++ hugo/trunk/src/work/athos/lp/lp_cplex.h	Mon Apr 11 17:46:14 2005
@@ -22,7 +22,7 @@
 
 #include <lemon/lp_base.h>
 extern "C" {
-#include "ilcplex/cplex.h"
+#include <ilcplex/cplex.h>
 }
 
 namespace lemon {