Chris Novakovic
6509b6ab9e
Makefile: use standard variable names for compilers and their flags
Rename the following makefile variables to their standard implicit
equivalents in GNU Make for the sake of clarity:
C -> CC
CPP -> CXX
CPPFLAGS -> CXXFLAGS
7 years ago
Chris Novakovic
aa09191f20
Makefile: prepend PRISM-specific _DIR variables with PRISM_
Rename the following makefile variables for the sake of clarity in child
makefiles:
SRC_DIR -> PRISM_SRC_DIR
CLASSES_DIR -> PRISM_CLASSES_DIR
OBJ_DIR -> PRISM_OBJ_DIR
LIB_DIR -> PRISM_LIB_DIR
INCLUDE_DIR -> PRISM_INCLUDE_DIR
IMAGES_DIR -> PRISM_IMAGES_DIR
DTDS_DIR -> PRISM_DTDS_DIR
The helper script src/scripts/printversion.sh also makes use of the
value of SRC_DIR exported from the main makefile, so use PRISM_SRC_DIR
in that script too.
7 years ago
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
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
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
Joachim Klein
a11d7c9797
JDD, prism.StateValues: find max finite value
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12107 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ce917c0248
dd_export.cc: format string %zu is not supported on Windows, use portable PRIuPTR
Windows needs %Iu for fprinting size_t / uintptr_t values, use the portable
format string macro available in C++11.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12012 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
4cca315ef2
Add JDD.FindMinPositive (minimal positive terminal constant of an MTBDD)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11459 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
a7f0aff6e4
JDD: add JDD.IsZeroOneMTBDD() method for checking if an MTBDD is a 0/1-MTBDD
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11448 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
ea8a7c6ba9
Add DebugJDD_GetExternalRefCounts
Analyze the BDD and return the implied number of external references per node
in a map (node -> count). Only return nodes with non-zero external references.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10505 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
96caf197ab
dd_matrix.cc: fix recently introduced error handling
+ some whitespace cleanup
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10493 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
4258503c80
Make DD_MatrixMultiply deal with memout in the same was other DD functions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10490 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
bfecd70db9
Small code fix in DD_MatrixMultiply.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10489 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
4dfcd39fd1
dd_*.cc: Argument checking, if any DdNode is NULL return NULL
This allows nesting of DD_ functions in the presence of CUDD memory errors.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10487 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
f559e0adb8
Return NaN for DD_FindMin / DD_FindMax on CUDD out of memory
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10486 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
eecc87786a
CuDD is actually called CUDD
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10485 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5ad8ef2269
Small typos
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10484 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
e9897b4838
dd_matrix.cc: Add NULL checks for the return values of DD functions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10479 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
efe6fe0ef9
dd_vars.cc: Add NULL checks for the return values of DD functions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10478 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
90326ecfaf
dd_term.cc: Add NULL checks for the return values of DD functions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10477 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
62bc1cc1d0
dd_basics.cc: Add NULL checks for the return values of DD functions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10476 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
3be99a61cf
dd_abstr.cc: Add NULL checks for the return values of DD functions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10475 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
9ce369d38e
JDD: Add a flag that can be set/checked in native code to indicate that a CuDD error has occurred.
For DD functions that return a DdNode*, errors can be reported by returning NULL.
Functions that have no return value (printing, etc) or a data value (double, etc)
should set the flag, which can be converted into an CuddOutOfMemoryException on
the PRISM side using JDD.checkForCuddError()
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10474 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
3b3a24cfe5
Send CUDD non-zero ref warning to techLog, not stdout.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10307 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7eef2a266c
Fix a few compiler warnings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10059 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
556dff7b30
Disable debug checks on CUDD close: see if we can actually get rid of annoying cuddClearDeathRow error messages.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6685 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
4ca846889f
Extra DD-to-PP file export functionality for 3D matrices (from Vojta).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3234 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
4f031e6931
Cody tidy to remove some (C++) compiler errors.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1588 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
d199d035ed
Integration of prism-explicit branch into trunk, i.e. merge of trunk@1015-prism-explicit@1405 into trunk.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1406 bbc10eb1-c90d-0410-af57-cb519fbb1720
17 years ago
Dave Parker
55c0797a8c
Improvements to memory handling, especially in sparse/hybrid engines:
- better catching of memory-out errors
- improved clarity of memory usage output
- removed various memory leaks
- now consistently use new/delete, no malloc/free
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@899 bbc10eb1-c90d-0410-af57-cb519fbb1720
17 years ago
Dave Parker
ef59adf641
A few delete -> delete[] tidies.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@811 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
5b625308bd
Tweak to DD_PrintMatrix (ACCURACY_LIST).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@787 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
738b806fd2
Added (in full) log function to PRISM language.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@569 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
2179deefdb
Updated email addresses and affiliations in copyright info.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@547 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
ae981d6711
More type fixes for fussy compilers: pow(2,...) to pow(2.0,...).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@483 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
db117c74c4
Code tidy: some return types and int/double cast issues.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@480 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
5c1bb43a2f
Code tidy (function return types).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@452 bbc10eb1-c90d-0410-af57-cb519fbb1720
18 years ago
Dave Parker
0de9189bd3
Improvement to MTBDD vector/matrix display functions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@424 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
1ab82223c8
Added -extraddinfo command-line switch to display extra info about some (MT)BDDs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@309 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
1f4f93780c
Improved version of DD_PrintTerminals(AndNumbers) which handles negatives and +/- infinity.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@307 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
d636ab1969
Addition of 64-bit PRISM branch to trunk.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@262 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
5ef3824832
Rearrangement and tidy-up of copyright/license info in file headers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@253 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
20a6be968b
Removal of explicit lists of Java/C++ files from Makefiles (we are reliant on GNU make anyway).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@83 bbc10eb1-c90d-0410-af57-cb519fbb1720
19 years ago
Dave Parker
2e52615489
Addition of VariablesGreaterThan etc. functions to dd/jdd (used for symmetry).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11 bbc10eb1-c90d-0410-af57-cb519fbb1720
20 years ago
Dave Parker
b54050a199
PRISM trunk layout rearrangement.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4 bbc10eb1-c90d-0410-af57-cb519fbb1720
20 years ago