Joachim Klein
7cb9ce5788
[lpsolve] fix compilation issue in relation to isnan [with Sascha Wunderlich, David Müller]
The compilation wrapper 'ccc' of lpsolve tries to determine
whether the isnan macro is defined. The test program calls
isnan(0), i.e., with an integer argument. On current Arch Linux,
GCC uses _builtin_isnan, which leads to an error due to the integer
argument and the 'ccc' wrapper assumes that isnan is not defined.
This leads to compilation issues later on.
The fix replaces the isnan(0) test call with isnan(0.0).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11216 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
307e8b586f
lpsolve5j.cpp: Fix deletes
The Java wrapper around the C++ lpsolve library uses the construct
delete a, b, c;
in several locations. The apparent goal is to delete all the pointers,
however the semantics of the C++ comma operator intervene: Only the
first pointer is deleted.
It looks like the relevant locations are never reached from PRISM code,
so we fix it mostly to silence the compiler warnings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10571 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0ae5d13247
Bug in building lp_solve_java on ia65 (from Alexandre Duret-Lutz).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9671 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8342d6fcee
Fix typo in last commmit
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9520 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9d82693baf
Improvements to build process for Linux/Mac versions of lp_solve_java.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9519 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9e2c117954
lpsolve Makefile fix (from Steffen Maercker).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8599 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Vojtech Forejt
9ca61c1f74
changing permissions, to fix cygwin 64bit compilation
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8005 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
cb62c36630
More Makefile fixes for Win 64 build.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7560 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
fccb1a37a2
64-bit binary lpsolve DLL.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7556 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
2b614526e1
old, uncommitted lpsolve compiel fix
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6728 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
ebf6009569
lpsolve55j makefile fix.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6272 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
da2aa0e165
lpsolve55j makefile bug
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6271 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c6a6b330aa
More lpsolve(j) building.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6270 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
cee8e0b6b7
Remove pushd/popd from Makefile (crashed on Ubuntu).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6269 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
1a1cd1c8db
More lpsolve(j) building.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6268 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
55e0c90d10
More lpsolve(j) building.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6267 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
d9fe80a550
More lpsolve build fixes
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6266 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
0b7aae9352
32-bit Linux build of lpsolve55j.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6265 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
2bbbd0ef52
32-bit Linux build of lpsolve55j.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6264 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
a7233c7c50
32-bit Mac build of lpsolve55j.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6263 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
ddb280cdeb
32-bit Mac build of lpsolve55j.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6262 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
f5b74f986c
Update 32-bit Makefile for lpsolve.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6260 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Vojtech Forejt
f2b3b9bd7b
disabling ignored weights due to a numerical problem (multi(Pmax=?[F s1=7&s2=7&d1+d2=7],Pmax=?[F s1=7&s2=7&d1+d2=8]) with two-dice.nm)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6256 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
1206b0a117
Update lpsolve55j library (for Win).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6246 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
197de502a1
Use pre-built lpsolve libraries on Win.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6245 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
fc358c2418
Use pre-built lpsolve libraries on Win.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6244 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
9d2cdd6213
Use pre-built lpsolve libraries on Win.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6243 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
6e80fbfe8e
Use pre-built lpsolve libraries on Win.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6242 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Vojtech Forejt
b14e9be8c3
put updateRemovedActions back to the calling code as it was changing variables which were supposed to be non-local. Also fixed a bug where in temporary opandboundslist a non-temporary list was used (this was most likely a typo)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6239 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
799e22cd9f
lpsolve makefile tweak.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6235 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
d42e0c6560
Next attempt at Cygwin build script for lpsolve.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6234 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
b472f724d1
Next attempt at Cygwin build script for lpsolve.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6233 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
a51ad81bc3
Remove hard-coded compilers in lpsolve.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6232 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
5b5a5ed52d
Add Cygwin lpsolve55 build script (untested).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6231 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
aa9515c339
Better test for lpsolve55 Makefiles being called correctly (lib prefix empty on Windows).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6224 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
10ea5d9da0
Add building of new ext/ directory to Makefile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6220 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c6fb0ffb9b
Copy across ext/ directory (containing lpsolve55 and lp_solve_5.5_java) from prism-multi to trunk.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6219 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago