Joachim Klein
5adb550043
Makefiles: inhibit parallel building (-j n mode)
Currently, building PRISM with parallel building does not work,
as there are dependencies between targets that are not fully
encoded in the Makefiles. Building with -j n flag would lead to error.
Now, we add the .NOTPARALLEL target to most of the Makefiles,
which tell GNU make to ignore the -j flag. Note that this
only inhibits parallel builds for the current Makefile, we
thus have to specify it for all sub-Makefiles as well
(see https://www.gnu.org/software/make/manual/html_node/Parallel.html )
For the external libraries, CUDD and LPSolve don't seem to mind building
in parallel, so we don't inhibit there and can get some minor compile time
speed-up by using multiple cores if the -j option is specified.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12202 bbc10eb1-c90d-0410-af57-cb519fbb1720
8 years ago
Dave Parker
efc316ae5e
Update authors list used for git-svn migration.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12201 bbc10eb1-c90d-0410-af57-cb519fbb1720
8 years ago
Joachim Klein
c239ba7a6d
prism-auto: allow use of ngprism on Windows
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12198 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
a74d6b9841
prism-auto: refactor temporary log file handling to allow ngprism to work on Windows
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12197 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ef2f10e97e
Makefile: enable compilation of ngprism.c -> ngprism.exe on Windows
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12196 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b9b7c1dc01
ngprism.c: tweak to get ngprism.c to compile under Windows (MinGW)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12195 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ed01390e40
prism-auto: integrate warning for missing files (export check) into warning tracking / colour printing
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12194 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c45ca93580
param.BigRational: Fix signum (sign) computation for positive and negative infinity
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12193 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
83e6c291b0
(native) switch includes from .h to C++ header wrappers
Consistently include cstdio instead of stdio.h, etc. For MinGW,
the default underlying stdio implementation (Microsoft DLL based vs
POSIX MinGW implementation) differs between C++ and C code, so
format string warnings pop up if we include the C header...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12192 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
4652c72e78
dd_cudd.cc: silence printf warning
There is currently no portable format string argument for std::size_t,
so we simply convert to a string via std::to_string() ourselves.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12191 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7c5eb10d37
PH,PM,PS: cast jints to int in printf
On Win32, jints are actually long ints, so printf would need %ld instead of %d.
As jints are 32bit, we simply cast to an int to silence format string compiler
warning.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12190 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7d874df348
PrismMTBDD, PrismSparse export_string: Pass via "%s" to log
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12189 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
6b856bce86
PH, PS: log errors via "%s"
Silences compiler warnings about unsafe format string usage.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12188 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
a8b8daaf71
PS: cleanup warning message printing
Remove unused argument.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12187 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
2bb7a217f2
PS: cleanup format strings
%ld instead of %d for nnz
%ld for number of iterations / fgw.right (continuous time computations)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12186 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
14d652d331
PM: cleanup format strings
%ld for number of nodes
%ld for number of iterations / fgw.right (continuous time computations)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12185 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e31b05c257
PH: cleanup format strings
%ld for number of iterations / fgw.right (continuous time computations)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12184 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
0c39f57269
PM_ExportVector: use int64_t for ODD indexing, adapt printf format string
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12183 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7ae5a96d08
PM_ExportMatrix: use int64_t for ODD indexing, adapt printf format string
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12182 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
362c6da6c9
PM_ExportLabels: use int64_t for ODD indexing, adapt printf format string
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12181 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
8b3b240c8a
PM_ExportLabels: clean-up, remove unused argument from recursive calls
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12180 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
d564f13e9d
Makefile: add WARNINGS variable, activate -Wformat
We'd like to get format string warning messages. Will be fixed in subsequent commits.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12179 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
f7643a21ec
(symbolic engines) annotate P*_PrintToMainLog, error message, export_string methods for format string checks
GCC / CLang offer checking for consistency between format strings and the variable argument parameters that
are passed to printf-like functions. For these compilers, we add the necessary function attribute (use with -Wformat).
For MinGW, we have to be a bit more specific, as both a STDIO implementation by Microsoft as well
as a POSIX compatible implementation are supported. Generally, for C++, the POSIX library is used. We check the
MinGW compiler definition that selects the STDIO implementation and use the corresponding format specification
(gnu_printf vs ms_printf).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12178 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c6fa9d2d43
PM_ExportVector.cc: Fix export_string format string to get correct output for state rewards export (issue #16 )
Fixes https://github.com/prismmodelchecker/prism/issues/16 .
In SVN commit 12019 (1d8f9fc6b9 ),
we converted the ODD indizes from long to int64_t to get the same size in 32/64bit on Linux / OS X and Windows.
With this change, the format string used here became incorrect and, on 32bit Linux, the second "%.0f" printing takes
its value from part of the first argument instead of from the double returned by DD_GetNumMinterms.
Now, we use the PRId64 macro to get the correct format string parameter.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12177 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b43a911857
PM_ExportVector.cc: small cleanup
Remove third argument for an export_string call that only uses 2 in the format string.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12176 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
c9ede762cd
Tweak in options text.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12168 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
8f2f9a3d28
Bug fix in prism.ModelGenerator2MTBDD: action names were not being read properly.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12167 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
940674370c
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12165 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
28b0376dfb
dd_export.cc: fix compilation issue on cygwin (PRIuPTR)
Move cinttypes include before the cudd includes to get proper PRIuPTR definition
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12164 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
14ad1d32af
fix compilation issue: cmath / isinf
On newer GCCs, isinf needs to be std::isinf
Switch from math.h include to cmath.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12163 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
a0ab7b461f
Date fix in CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12162 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
2c39e577f8
Version number (4.4.beta).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12160 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
2e3b5fdc5b
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12159 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
f86fc8ace6
Tweak -help output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12158 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
42bec3f813
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12157 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
8bca4f7476
exact model checking: output approximate result as well
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12156 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e2e001c999
param.BigRational: fix pow() to correctly handle negative exponents
Previously, using BigRational.pow(exponent) with negative exponent would result in exception
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12155 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c2e86b5d2f
(interval iteration) total reward computation is not supported yet, throw error message
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12154 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
2efbd2c6a3
Tidy -help output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12153 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
639c71636b
Document -ng switch.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12152 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
c19384d343
Document -timeout switch.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12151 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
dc82a6ef67
Fix explicit engine import of state rewards (need to add details to ModelInfo for it to work properly). Also catch attempts to export state rewards more cleanly in this case.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12150 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
80aec9a2fa
cleanup some import warnings, artifacts of the recent set of refactorings...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12149 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c6df34232c
DTMC total reward, explicit: fix output glitch
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12148 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e138c51891
GUI, settings dialog: Make the comment area at the bottom vertically scrollable.
This allows display of longer comment text for a given setting.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12147 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
35858d3339
GUI, settings dialog: larger preferred width
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12146 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
126e21550a
explicit.ConstructModel: Convert DTMCSimple to DTMCSparse (as for MDPs) [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12145 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7ac2b39ca6
explicit.DTMCSparse: sparse storage variant for DTMCs [with Steffen Maercker]
adapted from MDPSparse
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12144 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
730785ea5f
explicit.MDPSparse: simplify code for getTransitionsIterator
Use AbstractMap.SimpleImmutableEntry and remove methods that have
default implementations since JDK8.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12143 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
65fd5cd795
(interval iteration, explicit) actually perform interval iteration using the explicit engine
Supported:
DTMC reachability probability and expected reward computations.
MDP Pmax, Pmin, Rmax, Rmin for reachability.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12142 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago