genmodel 0.0.48 → 0.0.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/ext/Genmodel/GenModel.h +6 -3
- data/ext/Genmodel/GenModelBase.cpp +465 -12
- data/ext/Genmodel/GenModelCplex.cpp +42 -24
- data/ext/Genmodel/GenModelCplex.h +4 -3
- data/ext/Genmodel/Genmodel.cpp +375 -211
- data/ext/Genmodel/extconf.rb +16 -2
- metadata +1 -1
data/ext/Genmodel/extconf.rb
CHANGED
@@ -48,6 +48,7 @@ CONFIG["CFLAGS"] = '-O2 -Wall -pthread -fmessage-length=0 -fPIC -std=c++0x'
|
|
48
48
|
sep = File::PATH_SEPARATOR
|
49
49
|
is_cplex = true;
|
50
50
|
is_osi = true;
|
51
|
+
is_zlib = true;
|
51
52
|
if is_darwin
|
52
53
|
path = Dir.home+"/Applications/IBM/ILOG/CPLEX_Studio126/cplex/include/"
|
53
54
|
puts "Looking for ilcplex/cplex.h in "+path
|
@@ -137,6 +138,14 @@ if is_darwin
|
|
137
138
|
# is_osi = false
|
138
139
|
#end
|
139
140
|
|
141
|
+
path = "/usr/lib:/usr/local/lib/"
|
142
|
+
puts "Looking for zlib (function main) in "+path
|
143
|
+
if(find_library("z",nil,path))
|
144
|
+
puts "found"
|
145
|
+
else
|
146
|
+
puts "not found"
|
147
|
+
is_zlib = false
|
148
|
+
end
|
140
149
|
|
141
150
|
path = "/usr/lib:/usr/local/lib/"
|
142
151
|
puts "Looking for Clp (function main) in "+path
|
@@ -323,17 +332,22 @@ elsif is_linux
|
|
323
332
|
else
|
324
333
|
is_cplex = false;
|
325
334
|
is_osi = false;
|
335
|
+
is_zlib = false
|
326
336
|
end
|
327
337
|
|
328
338
|
|
329
339
|
if(is_cplex)
|
330
|
-
puts "*** With
|
340
|
+
puts "*** With CPLEX_MODULE ***"
|
331
341
|
$defs.push("-DCPLEX_MODULE")
|
332
342
|
end
|
333
343
|
if(is_osi)
|
334
|
-
puts "*** With
|
344
|
+
puts "*** With OSI_MODULE ***"
|
335
345
|
$defs.push("-DOSI_MODULE")
|
336
346
|
end
|
347
|
+
if(is_zlib)
|
348
|
+
puts "*** With WITH_ZLIB_MODULE ***"
|
349
|
+
$defs.push("-DWITH_ZLIB_MODULE")
|
350
|
+
end
|
337
351
|
|
338
352
|
#swig -ruby -o Genmodel.cpp -c++ ../../src/Genmodel.i
|
339
353
|
|