PBerger
73ddba5b29
Merged master, applied fixes.
Added feedback from the cuda plugin and return of iteration count.
Former-commit-id: 711ca3d9ec
11 years ago
dehnert
aecd0e3cb8
Made Storm compile again without Z3: guarded some header inclusions and function definitions/implementations. Also guarded the tests that require certain libraries (like Gurobi, glpk, Z3), so that tests do not fail any more when the libraries are not available.
Former-commit-id: 307036e25c
11 years ago
dehnert
40c698af90
Some fixes to make new SMT framework compile with clang under Mac OS (includes fixes to some initializiation ordering warnings). Bugfix for PRISM parser to correctly handle formulas.
Former-commit-id: d513476066
11 years ago
David_Korzeniewski
3887cb57aa
Fix for temporaries and non const references
Former-commit-id: 4eadf6cdab
11 years ago
David_Korzeniewski
52d3d91060
Implemented Unsat Core/Assumtions & simple test
Former-commit-id: f79ee3a809
11 years ago
PBerger
d2f4c85711
Made changes to comply with new SparseMatrix Interface (YUCK).
Fixed tests, all that stuff.
Former-commit-id: c78de5f8ce
11 years ago
David_Korzeniewski
a815a6f425
Implemented allSat with z3 and test
Former-commit-id: 3795fc00c2
11 years ago
David_Korzeniewski
93c03fff3f
Fixed order of checks in Z3ExpressionAdapter, fixed missing override of isVariable in VariableExpression, removed unnecessary exception in Z3SmtSolver model generation
Former-commit-id: ca5f876655
11 years ago
PBerger
b7ad4398e2
Fixed an error in the interface of the LpSolvers.
Former-commit-id: 65e415efb2
11 years ago
David_Korzeniewski
a0319cb6e7
Model Generation and Tests for translating from z3 to storm
translating from z3 to storm has still some errors
Former-commit-id: 2a46b6c615
11 years ago
David_Korzeniewski
9a7b4f69ef
More tests and some small bugfixes for Z3SmtSolver
Former-commit-id: 71def90649
11 years ago
David_Korzeniewski
45bc8ea665
Conditional compilation for all parts using z3 by checking STORM_HAVE_Z3
Added first simple tests for Z3SmtSolver and Z3ExpressionAdapter
Former-commit-id: 77ade5ffa6
11 years ago
David_Korzeniewski
37ef3feebb
Fixed return type of addBinaryVariable
Former-commit-id: 44fc99b9a3
11 years ago
David_Korzeniewski
4e6c9b7d6b
Implemented translating z3 expressions to storm expressions
Former-commit-id: 945ce77e35
11 years ago
dehnert
66d6fa3bb4
Fixed wrong type.
Former-commit-id: 59e08c3669
11 years ago
dehnert
9e746549a8
Fully adapted MILP-based counterexample generator to new LP solver interface.
Former-commit-id: 83f3b8c507
11 years ago
dehnert
29d8111991
Adapted Gurobi and glpk LP solvers to expression-based interface. Adapted tests and made them work again.
Former-commit-id: 62379ddafd
11 years ago
dehnert
d5c2f9248f
Finished linear coefficient visitor and adapted glpk solver to new expression-based LP solver interface.
Former-commit-id: ba1d3a912f
11 years ago
dehnert
3158d19123
Started working on adapting LP solver interface to new expressions.
Former-commit-id: 6131736a7f
11 years ago
David_Korzeniewski
29083cc89c
Implemented asserting expressions and checking satisfiability with z3
Former-commit-id: bb49a49226
11 years ago
David_Korzeniewski
98f87a5e6d
Adapted Z3ExpressionAdapter for new expressions
SmtSolver now not copyable
Former-commit-id: e0d17fd21c
11 years ago
David_Korzeniewski
f69b79593c
initial interface for smt solver wrappers
Former-commit-id: e43b7afb3c
11 years ago
dehnert
33cce28df8
Fixed minor bug MILP-based minimal command set generator. GurobiLpSolver is now able to deal with constraints involving several instances of the same variable.
Former-commit-id: 4b5575a886
11 years ago
sjunges
0eb13c6415
fixed a lot of unused variable warnings
Former-commit-id: 806f74b30d
11 years ago
PBerger
a4a17de4fc
Added timing for PRCTL formula checking.
Replaced std::sort with std::inplace_merge, saving another factor 2.
Former-commit-id: 961c31bb68
11 years ago
PBerger
26500ff4a8
Refactored the CUDA Kernel to once again use the "hacked" combination of column indices and values with a bit of reinterpret_cast magic.
Refactored the CUDA-SCC grouping algorithm as is took 80x longer to calculate the groups than it took to calculate the entire solution.
Former-commit-id: 5a5ffabe38
11 years ago
PBerger
0922921b24
Updated cudaForStorm/CMakeLists.txt to make use of the new GIT based version schema.
Added version functions to the Cuda Plugin.
Edited storm.cpp to show version infos for the CUDA Plugin.
Fixed a critical error in basicValueIteration.cu which causes random SEGFAULTs... :P
Streamlined the TopologicalValueIterationNondeterministicLinearEquationSolver.cpp. The SCC group optimizer now returns flat_sets instead of a vector as the sets are ordered, which is required for the Solver to work.
This is now a stable version of StoRM containing a fully wor
Former-commit-id: 47d5c2825c
11 years ago
PBerger
05814f5d73
Fixed a bug in the equalModuloPrecision function of the CUDA Kernel
Added more debug output to the CUDA handler functions
Added a function for grouping of SCCs for better performance
Added functionality and accessors to the SparseMatrix
Former-commit-id: 770aec1b09
11 years ago
PBerger
d3f513b0a0
Added debug output to CUDA Kernel.
Added a performance test for the CUDA stuff.
Former-commit-id: 9953befdea
11 years ago
PBerger
c0a7e42486
Implemented a basic but complete kernel for value iteration in CUDA.
It doesnt work :(
Former-commit-id: 6a3a7aa505
11 years ago
dehnert
12743e0a7e
Moved from additional row grouping to the one embedded in the matrix itself.
Former-commit-id: 9d7a1fff10
11 years ago
PBerger
68a6e533be
Added error handling in GurobiLpSolver.cpp
Fixed a bug related to commit 486e99d6ae
[formerly 1300d77ae8
] where updateModel was not called before adding constraints in the GurobiLpSolverTest.cpp
Former-commit-id: 9f619e5039
11 years ago
PBerger
a6e7e6b4e0
Edited GurobiLpSolver.cpp, added the error code to the messages.
Former-commit-id: d14dc05cda
11 years ago
PBerger
af650b6666
Removed debug outputs from the TopologicalValueIterationNondeterministicLinearEquationSolver
Fixed the topo tests, since the comparison values are a bit off for this solver
Former-commit-id: 56c763b37a
11 years ago
PBerger
a4ae226e57
Removed debug output from our debugging session
Former-commit-id: 43a0c63a6c
11 years ago
dehnert
f049a9f0af
Bugfix for topological equation solver.
Former-commit-id: b8563f8b3e
11 years ago
PBerger
98b0bcf187
Reimplemented the TopologicalValueIterationNondeterministicLinearEquationSolver with splitting into submatrices.
Added a dtmc example for tests with the StronglyConnectedComponentDecomposition.
Former-commit-id: 0c33793fe6
11 years ago
dehnert
17d9df1ac7
Some fixes to make the branch compile with clang.
Former-commit-id: f9127a23c9
11 years ago
PBerger
4eef3b0d57
Added an example for SCC related testing which will change soon
Removed unnecessary code from the TopologicalValueIterationMdpPrctlModelChecker.h
Fixed Bugs in graph.h (changes from Sparse Matrix Iterator, it didnt even compile anymore! Unused Code HAUNTS us)
Former-commit-id: 96669adec9
11 years ago
PBerger
57b6208eee
Added a pseudo model which can be constructed from only a matrix to look and behave like a model for use in Decomposition classes
Former-commit-id: f8fdc5a9b6
11 years ago
PBerger
64891af785
Trying to refurbish the TopologicalValueIterationMdpPrctlModelChecker
Former-commit-id: 2963c774b0
11 years ago
PBerger
9d1e53cff9
Added a missing include for uint_fast64_t to be recognized as a type
Former-commit-id: 4ccde721bb
11 years ago
dehnert
486e99d6ae
Added signal handler for SIGTERM. Introduced delayed update for LP solvers to reduce overhead.
Former-commit-id: 1300d77ae8
11 years ago
dehnert
42708a6d21
Added utility header for all parts that use std::swap.
Former-commit-id: 55a2f56440
11 years ago
dehnert
36fb44e206
Added functional tests for nondeterministic linear equation solvers. Added functional tests for LPs in addition to the existing MILP tests.
Former-commit-id: 8c0fa08f2d
11 years ago
dehnert
514aace4fd
Added function tests for both glpk- and Gurobi-based LP solver implementations. Found and fixed some bugs while doing this.
Former-commit-id: 99e58097f7
11 years ago
dehnert
c5985be437
Minor fixes for GlpkLpSolver.
Former-commit-id: 07595da7f3
11 years ago
dehnert
8ebd924ca6
Further work on refactoring solvers: cleaned LP solver interface a bit and adapted glpk- and Gurobi-based implementations of the interface.
Former-commit-id: 25b7a22bcc
11 years ago
dehnert
588a4b60b6
Refactored linear equation solvers and nondeterministic linear equation solvers. Added functional tests for both.
Former-commit-id: 0abb11828a
11 years ago
dehnert
79730379e4
Started refactoring the linear equation system solvers.
Former-commit-id: 72d647fd42
11 years ago