graph extraction in cphydra

eomahony · Oct 4, 2010 · d021a69 · d021a69
1 parent 6032315
commit d021a69
Show file tree

Hide file tree

Showing 13 changed files with 577 additions and 296 deletions.
diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ release: local_install Numberjack.0.1.$(DATE).zip
 
 Numberjack.0.1.$(DATE).zip: Numberjack.0.1.$(DATE)/src $(TARGET_RELEASE)
 	@echo Build archive
-	#rm -rf Numberjack.0.1.$(DATE)/solvers/scip
+	rm -rf Numberjack.0.1.$(DATE)/solvers/scip
 	#tar -cjf Numberjack.0.1.$(DATE).bz2 Numberjack.0.1.$(DATE)
 	zip -r Numberjack.0.1.$(DATE).zip Numberjack.0.1.$(DATE)
 	rm -rf Numberjack.0.1.$(DATE)

diff --git a/examples/unit_tests.py b/examples/unit_tests.py
@@ -26,12 +26,12 @@
         print '******', lib_str
         print '**************************************'
         lib = __import__(lib_str)
-        param = lib.default
-        param['verbose'] = 0
+        lib_param = lib.default
+        lib_param['verbose'] = 0
         for solver in lib.solvers:
             print 'run', lib_str, 'with', solver
-            param['solver'] = solver
-            outcome[lib_str][solver] = lib.solve(param)
+            lib_param['solver'] = solver
+            outcome[lib_str][solver] = lib.solve(lib_param)
 
 for lib in reference.keys():
     print 'checking', lib+':'

diff --git a/solvers/mistral/Makefile b/solvers/mistral/Makefile
@@ -52,7 +52,7 @@ OPTFLAGS = -O3 #-m32
 #OPTFLAGS = -finstrument-functions 
 #OPTFLAGS = -g
 
-COMPILFLAGS = -Wall -D_UNIX -fPIC #-D_DEBUGSEARCH #-D_DEBUGSCHED -D_DEBUGMODEL # #-D_DEBUGPROPAG 
+COMPILFLAGS = -Wall -D_UNIX -fPIC #-D_DEBUGSEARCH #-D_DEBUGPROPAG #-D_DEBUGSCHED -D_DEBUGMODEL #
 
 #-Wl,--hash-style=sysv
 #-D_DEBUGSEARCH \