dehnert
dea56e1bd4
Added some missing includes and some stubs for additional functionality of DD abstraction layer.
Former-commit-id: d90d525993
11 years ago
dehnert
52cd48c247
Fixed bug in restriction of a program to certain commands. Also, modules may now have an action without actually having a command labeled with the action and the explicit model adapter now handles this correctly.
Former-commit-id: 6bbb4b807c
11 years ago
dehnert
c2c353f6b9
Readded missing file.
Former-commit-id: acc68213d4
11 years ago
dehnert
a63cda69f5
Added function to retrieve range DD for meta variable.
Former-commit-id: 32ef6715f4
11 years ago
dehnert
874fc8a864
Alpha version of DD abstraction layer.
Former-commit-id: 98cc5f3aa7
11 years ago
dehnert
97e4e01250
Further step towards finalizing the abstraction layer for DDs.
Former-commit-id: efd5822b67
11 years ago
dehnert
70fc3ec29a
Further work on abstraction layer for DDs.
Former-commit-id: 245986076b
11 years ago
dehnert
de44a1562c
Started writing the DD abstraction layer.
Former-commit-id: 8720a38b17
11 years ago
masawei
2ed6be853b
Fixed two minor bugs.
- First one concerning the MappedFileTest in which I neglected to consider that the number of characters used to signal a new line differs between Linux (\n -> 1) and Windows (\r\n -> 2) which caused the test to fail on all OS using two characters (hence not on Linux, where I ran the tests).
- Second bug concerned the case that a transition reward file contained more states than the corresponding transition file.
In that case the parser tried to acces the entry of the rowGroupIndices vector behind the last actual entry, which caused an exception to be thrown.
Now there is a check whether the highest state index found by the parser does exceed the highest state index of the model.
Former-commit-id: bc83267f3c
11 years ago
masawei
db1bb8b70e
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: b639e5a703
11 years ago
masawei
8f171c7dc5
Finished initial remerge.
- Fixed comments.
- It seems to be ASSERT_EQ(expected, actual);
|-> Switched arguments of nearly all ASSERT_EQs to correctly use this macro in the parser tests.
Former-commit-id: e5059709f2
11 years ago
masawei
28910462ec
Necessary changes to the nondeterministic parses to compensate for the change in the way the mapping between states of the model and the rows of the transition matrix are handled.
- All tests are green.
- Some comments are now a bit wrong.
Next up: Correct comments.
Former-commit-id: 610c0282b2
11 years ago
PBerger
1d70331123
Fixed a bug in a Regex.
Former-commit-id: 33793efb16
11 years ago
PBerger
2ad5e57db2
Refactored version handling. Its now done via Tags in GIT.
Added CPack configuration as to build packages on the build servers.
Former-commit-id: f3d9507867
11 years ago
masawei
08168f5511
Merge branch 'refactureParsers'
Conflicts:
src/parser/MarkovAutomatonParser.cpp
src/parser/MarkovAutomatonSparseTransitionParser.cpp
src/parser/MarkovAutomatonSparseTransitionParser.h
src/parser/NondeterministicModelParser.cpp
src/parser/NondeterministicModelParser.h
src/parser/NondeterministicSparseTransitionParser.cpp
test/functional/storage/MaximalEndComponentDecompositionTest.cpp
Former-commit-id: db4aea7faa
11 years ago
masawei
6444fc5197
Last fixes and changes.
- Some renaming (among others unmatched -> mismatched).
- Added checks and tests for doubled or skipped lines as well as lines concerning the same transition.
Next up: Remerge.)
Former-commit-id: 05efcbf91c
11 years ago
masawei
ff1ba43940
Lots of renames.
Former-commit-id: 1fb2726396
11 years ago
PBerger
9b70810354
Added a compiler directive for GCC to fix a bug occurring in Boost since Version 1.54 with GCC >= 4.7.0 (see https://svn.boost.org/trac/boost/ticket/8774 )
Former-commit-id: 60b0d1416e
11 years ago
PBerger
3f53a44482
Modified CMakeLists.txt, made the variable names a bit more clear. All Storm-related options should be prefixed with STORM_ so that they dont break or influence dependent builds.
Former-commit-id: 9aea43e3e2
11 years ago
PBerger
63933637ac
Fixed a bug in the SparseMatrix.cpp. When using TBB the typename is not permitted.
Former-commit-id: e191c14e1d
11 years ago
PBerger
84a794164c
Updated the BUILD.txt file with current information.
Former-commit-id: efa4d0b2e4
11 years ago
PBerger
b6d3e4c0aa
Fixed includes in a function (linkage errors).
Former-commit-id: d7554655ec
11 years ago
PBerger
dfd67c66fd
Added output for linked solvers in the StoRM header print.
Former-commit-id: 831d132b22
11 years ago
PBerger
7c93109773
Updated Intel Threading Building Blocks to Version 4.2.
Edited the FindTBB script to better parse and find the libraries.
TBB now includes builds for Mac @ libc++.
Former-commit-id: 4f573ee6a2
11 years ago
PBerger
533692914d
Upgraded shipped version of eigen to 3.2.1. Official release comment: This is a maintenance release with many bug fixes since the release of 3.2.0 half a year ago. The support for Eigen2 is now marked as deprecated and will be removed in the forthcoming 3.3 release. There are also some limited performance improvements and added functionality in the 3.2.1 release.
Former-commit-id: bcf5d3b32b
11 years ago
PBerger
38659f01f9
Reintegrated needed changes in the log4cplus CMakeLists.txt files.
Updated the .gitignore file
Former-commit-id: e2de059cb7
11 years ago
PBerger
59b7ca39d9
Updated log4CPlus to latest version containing bugfixes.
Former-commit-id: 4b588bd66a
11 years ago
dehnert
a6841c0a4d
Removed reference to obsolete method.
Former-commit-id: b215303f56
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
dehnert
d092897247
Merged master and added correct row group creation to MarkovAutomaton parser.
Former-commit-id: dcd9368634
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
dehnert
584a79f974
Added proper creation of row grouping to nondeterministic model parser and the explicit model adapter.
Former-commit-id: 723ddb2e1d
11 years ago
dehnert
d70bb836bb
Tests are now working again with the row-grouped matrix.
Former-commit-id: b58e76b5bb
11 years ago
dehnert
38833e308f
Started to add row-grouping to sparse matrix class.
Former-commit-id: 39e3703095
11 years ago
PBerger
a6e7e6b4e0
Edited GurobiLpSolver.cpp, added the error code to the messages.
Former-commit-id: d14dc05cda
11 years ago
PBerger
f0aa54823e
Added glpk to resources.
Wrote a CMakeLists.txt file for GLPK that works with MSVC, GCC and Clang.
Former-commit-id: a9884f3736
11 years ago
masawei
77fe1e1bda
Added NondeterministcModelParser tests and SparseStateRewardParser tests.
- Done with the tests. At least for now.
|- There are tests for all parsers and helper classes now.
Next up: Some minor fixes and finally the merge.
Former-commit-id: ebb2ea50d5
11 years ago
masawei
5318d9254a
Refactured the MarkovAutomatonParser tests, added to them and split them into two files.
- Also prepared files for the NondeterministicModelPArser tests.
Former-commit-id: f8909e2ef5
11 years ago
masawei
fc45cdb238
Added tests for deterministic models i.e. DeterministicModelParserTest and DeterministicSparseTransitionParserTest
- Additionally lots of small changes to other tests and test files.
Former-commit-id: d0b3f968ea
11 years ago
fp893004
e452d58ed0
Fixed wrong parameter name for unix systems.
Former-commit-id: 7cab693ae6
11 years ago
masawei
df2e65b667
Added a test for the AutoParser.
Former-commit-id: a51f3af653
11 years ago
masawei
07465f604a
Refactored and added to the test for the AtomicPropositionLabelParser.
Former-commit-id: 8cae0fd9df
11 years ago
masawei
52f130ea5c
Commenting and cleanup.
-Also threw out a few more unneeded includes.
Next up: Tests and then remerge.
Former-commit-id: 79f35c4409
11 years ago
dehnert
6e63e1c296
Minor bugfix.
Former-commit-id: d53be4f673
11 years ago
PBerger
fcc17b800b
Reworked SIGALRM handling to work under windows
Former-commit-id: 9073af2e28
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
PBerger
deb9cb1e91
Duplicated the constructor of SparseMarkovAutomatonCslModelChecker to work around a bug in C++ with nested template argument deductions
Former-commit-id: c13a5bdd7d
11 years ago
PBerger
b9a4faea09
Removed unused named variables in MILPMinimalLabelSetGenerator.h
Former-commit-id: 7639927da6
11 years ago
masawei
fe7afc727f
Second part of the refactoring of Parser.cpp/.h
- Eliminated the need for SupportedLineEndings (I hope...should work on all os, but have only tested this on linux)
- Moved fileExistsAndIsReadable to MappedFile
- Removed scanForModelHint and replaced it with its contents at the one point where is was used in the AutoParser
- Moved and renamed remaining part of Parser.cpp/.h to src/utility/cstring.cpp/.h
|- New namespace of the cstring manipulation functions is storm::utility::cstring
|- Used a using namespace storm::utility::cstring to eliminate the full namespace specification within the needing parsers. This keeps the code readable.
- Threw out some unnessesary includes.
Next up: Commenting and making things look nice.
Former-commit-id: c983d1e1a2
11 years ago
dehnert
8fabc2064a
Added property files for WLAN example.
Former-commit-id: 04d6b22b44
11 years ago