Browse Source
Merge branch 'master' into PrctlParser
Merge branch 'master' into PrctlParser
Conflicts: src/formula/Formulas.h src/formula/PctlPathFormula.h src/formula/PctlStateFormula.h src/formula/ProbabilisticBoundOperator.h src/formula/RewardBoundOperator.h src/modelChecker/DtmcPrctlModelChecker.h src/parser/PrctlParser.cpp src/parser/PrctlParser.hmain
132 changed files with 2671 additions and 1405 deletions
-
12.gitignore
-
2CMakeLists.txt
-
32resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake
-
32resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
-
4resources/3rdparty/log4cplus-1.1.0/CTestTestfile.cmake
-
35resources/3rdparty/log4cplus-1.1.0/Makefile
-
17resources/3rdparty/log4cplus-1.1.0/cmake_install.cmake
-
10resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config.h
-
6resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx
-
4resources/3rdparty/log4cplus-1.1.0/loggingserver/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/loggingserver/Makefile
-
15resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver
-
4resources/3rdparty/log4cplus-1.1.0/src/CTestTestfile.cmake
-
351resources/3rdparty/log4cplus-1.1.0/src/Makefile
-
147resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake
-
4resources/3rdparty/log4cplus-1.1.0/tests/CTestTestfile.cmake
-
47resources/3rdparty/log4cplus-1.1.0/tests/Makefile
-
4resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/appender_test/Makefile
-
BINresources/3rdparty/log4cplus-1.1.0/tests/appender_test/appender_test
-
7resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake
-
37resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake
-
4resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/configandwatch_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CTestTestfile.cmake
-
69resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/customloglevel_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/fileappender_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/filter_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/filter_test/filter_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/hierarchy_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/loglog_test/loglog_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/ndc_test/ndc_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/ostream_test/ostream_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/patternlayout_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/performance_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/performance_test/performance_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CTestTestfile.cmake
-
63resources/3rdparty/log4cplus-1.1.0/tests/priority_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/priority_test/priority_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/propertyconfig_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/thread_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/thread_test/thread_test
-
4resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CTestTestfile.cmake
-
57resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/Makefile
-
7resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake
-
BINresources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/timeformat_test
-
57src/adapters/EigenAdapter.h
-
2src/adapters/GmmxxAdapter.h
-
6src/exceptions/BaseException.h
-
19src/exceptions/InvalidAccessException.h
-
73src/formula/AbstractFormula.h
-
56src/formula/AbstractFormulaChecker.h
-
32src/formula/AbstractPathFormula.h
-
31src/formula/AbstractStateFormula.h
-
65src/formula/And.h
-
51src/formula/Ap.h
-
60src/formula/BoundOperator.h
-
60src/formula/BoundedEventually.h
-
211src/formula/BoundedNaryUntil.h
-
67src/formula/BoundedUntil.h
-
53src/formula/CumulativeReward.h
-
61src/formula/Eventually.h
-
9src/formula/Formulas.h
-
61src/formula/Globally.h
-
53src/formula/InstantaneousReward.h
-
59src/formula/Next.h
-
63src/formula/NoBoundOperator.h
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
351
resources/3rdparty/log4cplus-1.1.0/src/Makefile
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -1,6 +1,6 @@ |
|||||
# CMake generated Testfile for |
# CMake generated Testfile for |
||||
# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test |
# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test |
||||
# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test |
# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test |
||||
# |
# |
||||
# This file includes the relevent testing commands required for |
# This file includes the relevent testing commands required for |
||||
# testing this directory and lists subdirectories to be tested as well. |
# testing this directory and lists subdirectories to be tested as well. |
||||
|
@ -0,0 +1,57 @@ |
|||||
|
/* |
||||
|
* EigenAdapter.h |
||||
|
* |
||||
|
* Created on: 21.01.2013 |
||||
|
* Author: Philipp Berger |
||||
|
*/ |
||||
|
|
||||
|
#ifndef STORM_ADAPTERS_EIGENADAPTER_H_ |
||||
|
#define STORM_ADAPTERS_EIGENADAPTER_H_ |
||||
|
|
||||
|
#include "src/storage/SparseMatrix.h" |
||||
|
#include "Eigen/Sparse" |
||||
|
|
||||
|
#include "log4cplus/logger.h" |
||||
|
#include "log4cplus/loggingmacros.h" |
||||
|
|
||||
|
extern log4cplus::Logger logger; |
||||
|
|
||||
|
namespace storm { |
||||
|
|
||||
|
namespace adapters { |
||||
|
|
||||
|
class EigenAdapter { |
||||
|
public: |
||||
|
/*! |
||||
|
* Converts a sparse matrix into the sparse matrix in the eigen format. |
||||
|
* @return A pointer to a row-major sparse matrix in eigen format. |
||||
|
*/ |
||||
|
template<class T> |
||||
|
static Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>* toEigenSparseMatrix(storm::storage::SparseMatrix<T> const& matrix) { |
||||
|
uint_fast64_t realNonZeros = matrix.getNonZeroEntryCount(); |
||||
|
LOG4CPLUS_DEBUG(logger, "Converting matrix with " << realNonZeros << " non-zeros to Eigen format."); |
||||
|
|
||||
|
// Prepare the resulting matrix. |
||||
|
Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>* result = new Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>(matrix.rowCount, matrix.colCount); |
||||
|
|
||||
|
result->resizeNonZeros(realNonZeros); |
||||
|
//result->reserve(realNonZeros); |
||||
|
|
||||
|
// Copy Row Indications |
||||
|
std::copy(matrix.rowIndications.begin(), matrix.rowIndications.end(), (result->outerIndexPtr())); |
||||
|
// Copy Columns Indications |
||||
|
std::copy(matrix.columnIndications.begin(), matrix.columnIndications.end(), (result->innerIndexPtr())); |
||||
|
// And do the same thing with the actual values. |
||||
|
std::copy(matrix.valueStorage.begin(), matrix.valueStorage.end(), (result->valuePtr())); |
||||
|
|
||||
|
LOG4CPLUS_DEBUG(logger, "Done converting matrix to Eigen format."); |
||||
|
|
||||
|
return result; |
||||
|
} |
||||
|
}; |
||||
|
|
||||
|
} //namespace adapters |
||||
|
|
||||
|
} //namespace storm |
||||
|
|
||||
|
#endif /* STORM_ADAPTERS_GMMXXADAPTER_H_ */ |
@ -0,0 +1,19 @@ |
|||||
|
#ifndef STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_ |
||||
|
#define STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_ |
||||
|
|
||||
|
#include "src/exceptions/BaseException.h" |
||||
|
|
||||
|
namespace storm { |
||||
|
|
||||
|
namespace exceptions { |
||||
|
|
||||
|
/*! |
||||
|
* @brief This exception is thrown when a function is used/accessed that is forbidden to use (e.g. Copy Constructors) |
||||
|
*/ |
||||
|
STORM_EXCEPTION_DEFINE_NEW(InvalidAccessException) |
||||
|
|
||||
|
} // namespace exceptions |
||||
|
|
||||
|
} // namespace storm |
||||
|
|
||||
|
#endif // STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_ |
@ -0,0 +1,73 @@ |
|||||
|
/* |
||||
|
* Abstractformula.h |
||||
|
* |
||||
|
* Created on: 19.10.2012 |
||||
|
* Author: Thomas Heinemann |
||||
|
*/ |
||||
|
|
||||
|
#ifndef STORM_FORMULA_ABSTRACTFORMULA_H_ |
||||
|
#define STORM_FORMULA_ABSTRACTFORMULA_H_ |
||||
|
|
||||
|
#include <string> |
||||
|
|
||||
|
namespace storm { namespace formula { |
||||
|
template <class T> class AbstractFormula; |
||||
|
}} |
||||
|
|
||||
|
#include "src/modelChecker/AbstractModelChecker.h" |
||||
|
#include "src/formula/AbstractFormulaChecker.h" |
||||
|
|
||||
|
namespace storm { |
||||
|
namespace formula { |
||||
|
|
||||
|
|
||||
|
//abstract |
||||
|
/*! |
||||
|
* @brief Abstract base class for Abstract formulas in general. |
||||
|
* |
||||
|
* @attention This class is abstract. |
||||
|
* @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so |
||||
|
* the syntax conflicts with copy constructors for unary operators. To produce an identical object, the classes |
||||
|
* AbstractPathFormula and AbstractStateFormula offer the method clone(). |
||||
|
* |
||||
|
* This is the base class for every formula class in every logic. |
||||
|
*/ |
||||
|
template <class T> |
||||
|
class AbstractFormula { |
||||
|
|
||||
|
public: |
||||
|
/*! |
||||
|
* Virtual destructor. |
||||
|
*/ |
||||
|
virtual ~AbstractFormula() { } |
||||
|
|
||||
|
/*! |
||||
|
* @brief Return string representation of this formula. |
||||
|
* |
||||
|
* @note very subclass must implement this method. |
||||
|
* |
||||
|
* @returns a string representation of the formula |
||||
|
*/ |
||||
|
virtual std::string toString() const = 0; |
||||
|
|
||||
|
/*! |
||||
|
* @brief Checks if all subtrees are valid in some logic. |
||||
|
* |
||||
|
* @note Every subclass must implement this method. |
||||
|
* |
||||
|
* This method is given a checker object that knows which formula |
||||
|
* classes are allowed within the logic the checker represents. Every |
||||
|
* subclass is supposed to call checker.conforms() for all child |
||||
|
* formulas and return true if and only if all those calls returned |
||||
|
* true. |
||||
|
* |
||||
|
* @param checker Checker object. |
||||
|
* @return true iff all subtrees are valid. |
||||
|
*/ |
||||
|
virtual bool conforms(const AbstractFormulaChecker<T>& checker) const = 0; |
||||
|
}; |
||||
|
|
||||
|
} // namespace formula |
||||
|
} // namespace storm |
||||
|
|
||||
|
#endif /* STORM_FORMULA_ABSTRACTFORMULA_H_ */ |
@ -0,0 +1,56 @@ |
|||||
|
#ifndef STORM_FORMULA_ABSTRACTFORMULACHECKER_H_ |
||||
|
#define STORM_FORMULA_ABSTRACTFORMULACHECKER_H_ |
||||
|
|
||||
|
#include "src/formula/AbstractFormula.h" |
||||
|
|
||||
|
namespace storm { |
||||
|
namespace formula { |
||||
|
|
||||
|
/*! |
||||
|
* @brief Base class for all formula checkers. |
||||
|
* |
||||
|
* A formula checker is used to check if a given formula is valid in some |
||||
|
* logic. Hence, this pure virtual base class should be subclassed for |
||||
|
* every logic we support. |
||||
|
* |
||||
|
* Every subclass must implement conforms(). It gets a pointer to an |
||||
|
* AbstractFormula object and should return if the subtree represented by |
||||
|
* this formula is valid in the logic. |
||||
|
* |
||||
|
* Usually, this will be implemented like this: |
||||
|
* @code |
||||
|
* if ( |
||||
|
* dynamic_cast<const And<T>*>(formula) || |
||||
|
* dynamic_cast<const Not<T>*>(formula) || |
||||
|
* dynamic_cast<const Or<T>*>(formula) |
||||
|
* ) { |
||||
|
* return formula->conforms(*this); |
||||
|
* } else return false; |
||||
|
* @endcode |
||||
|
* |
||||
|
* Every formula class implements a conforms() method itself which calls |
||||
|
* conforms() on the given checker for every child in the formula tree. |
||||
|
* |
||||
|
* If the formula structure is not an actual tree, but an directed acyclic |
||||
|
* graph, the shared subtrees will be checked twice. If we have directed |
||||
|
* cycles, we will have infinite recursions. |
||||
|
*/ |
||||
|
template <class T> |
||||
|
class AbstractFormulaChecker { |
||||
|
public: |
||||
|
/*! |
||||
|
* @brief Checks if the given formula is valid in some logic. |
||||
|
* |
||||
|
* Every subclass must implement this method and check, if the |
||||
|
* formula object is valid in the logic of the subclass. |
||||
|
* |
||||
|
* @param formula A pointer to some formula object. |
||||
|
* @return true iff the formula is valid. |
||||
|
*/ |
||||
|
virtual bool conforms(const AbstractFormula<T>* formula) const = 0; |
||||
|
}; |
||||
|
|
||||
|
} // namespace formula |
||||
|
} // namespace storm |
||||
|
|
||||
|
#endif |
@ -0,0 +1,211 @@ |
|||||
|
/* |
||||
|
* BoundedNaryUntil.h |
||||
|
* |
||||
|
* Created on: 19.10.2012 |
||||
|
* Author: Thomas Heinemann |
||||
|
*/ |
||||
|
|
||||
|
#ifndef STORM_FORMULA_BOUNDEDNARYUNTIL_H_ |
||||
|
#define STORM_FORMULA_BOUNDEDNARYUNTIL_H_ |
||||
|
|
||||
|
#include "src/formula/AbstractPathFormula.h" |
||||
|
#include "src/formula/AbstractStateFormula.h" |
||||
|
#include "src/modelChecker/AbstractModelChecker.h" |
||||
|
#include "boost/integer/integer_mask.hpp" |
||||
|
#include <string> |
||||
|
#include <vector> |
||||
|
#include <tuple> |
||||
|
#include <sstream> |
||||
|
#include "src/formula/AbstractFormulaChecker.h" |
||||
|
|
||||
|
namespace storm { |
||||
|
namespace formula { |
||||
|
|
||||
|
template <class T> class BoundedNaryUntil; |
||||
|
|
||||
|
/*! |
||||
|
* @brief Interface class for model checkers that support BoundedNaryUntil. |
||||
|
* |
||||
|
* All model checkers that support the formula class BoundedNaryUntil must inherit |
||||
|
* this pure virtual class. |
||||
|
*/ |
||||
|
template <class T> |
||||
|
class IBoundedNaryUntilModelChecker { |
||||
|
public: |
||||
|
/*! |
||||
|
* @brief Evaluates BoundedNaryUntil formula within a model checker. |
||||
|
* |
||||
|
* @param obj Formula object with subformulas. |
||||
|
* @return Result of the formula for every node. |
||||
|
*/ |
||||
|
virtual std::vector<T>* checkBoundedNaryUntil(const BoundedNaryUntil<T>& obj) const = 0; |
||||
|
}; |
||||
|
|
||||
|
/*! |
||||
|
* @brief |
||||
|
* Class for a Abstract (path) formula tree with a BoundedNaryUntil node as root. |
||||
|
* |
||||
|
* Has at least two Abstract state formulas as sub formulas and an interval |
||||
|
* associated with all but the first sub formula. We'll call the first one |
||||
|
* \e left and all other one \e right. |
||||
|
* |
||||
|
* @par Semantics |
||||
|
* The formula holds iff \e left holds until eventually any of the \e right |
||||
|
* formulas holds after a number of steps contained in the interval |
||||
|
* associated with this formula. |
||||
|
* |
||||
|
* The subtrees are seen as part of the object and deleted with the object |
||||
|
* (this behavior can be prevented by setting them to NULL before deletion) |
||||
|
* |
||||
|
* @see AbstractPathFormula |
||||
|
* @see AbstractFormula |
||||
|
*/ |
||||
|
template <class T> |
||||
|
class BoundedNaryUntil : public AbstractPathFormula<T> { |
||||
|
|
||||
|
public: |
||||
|
/*! |
||||
|
* Empty constructor |
||||
|
*/ |
||||
|
BoundedNaryUntil() { |
||||
|
this->left = NULL; |
||||
|
this->right = new std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>(); |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* Constructor |
||||
|
* |
||||
|
* @param left The left formula subtree |
||||
|
* @param right The left formula subtree |
||||
|
* @param bound The maximal number of steps |
||||
|
*/ |
||||
|
BoundedNaryUntil(AbstractStateFormula<T>* left, std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* right) { |
||||
|
this->left = left; |
||||
|
this->right = right; |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* Destructor. |
||||
|
* |
||||
|
* Also deletes the subtrees. |
||||
|
* (this behaviour can be prevented by setting the subtrees to NULL before deletion) |
||||
|
*/ |
||||
|
virtual ~BoundedNaryUntil() { |
||||
|
if (left != NULL) { |
||||
|
delete left; |
||||
|
} |
||||
|
if (right != NULL) { |
||||
|
delete right; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* Sets the left child node. |
||||
|
* |
||||
|
* @param newLeft the new left child. |
||||
|
*/ |
||||
|
void setLeft(AbstractStateFormula<T>* newLeft) { |
||||
|
left = newLeft; |
||||
|
} |
||||
|
|
||||
|
void setRight(std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* newRight) { |
||||
|
right = newRight; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
/*! |
||||
|
* Sets the right child node. |
||||
|
* |
||||
|
* @param newRight the new right child. |
||||
|
*/ |
||||
|
void addRight(AbstractStateFormula<T>* newRight, T upperBound, T lowerBound) { |
||||
|
this->right->push_back(std::tuple<AbstractStateFormula<T>*,T,T>(newRight, upperBound, lowerBound)); |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* @returns a pointer to the left child node |
||||
|
*/ |
||||
|
const AbstractStateFormula<T>& getLeft() const { |
||||
|
return *left; |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* @returns a pointer to the right child nodes. |
||||
|
*/ |
||||
|
const std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>& getRight() const { |
||||
|
return *right; |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* @returns a string representation of the formula |
||||
|
*/ |
||||
|
virtual std::string toString() const { |
||||
|
std::stringstream result; |
||||
|
result << "( " << left->toString(); |
||||
|
for (auto it = this->right->begin(); it != this->right->end(); ++it) { |
||||
|
result << " U[" << std::get<1>(*it) << "," << std::get<2>(*it) << "] " << std::get<0>(*it)->toString(); |
||||
|
} |
||||
|
result << ")"; |
||||
|
return result.str(); |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* Clones the called object. |
||||
|
* |
||||
|
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones |
||||
|
* |
||||
|
* @returns a new BoundedNaryUntil-object that is identical the called object. |
||||
|
*/ |
||||
|
virtual AbstractPathFormula<T>* clone() const { |
||||
|
BoundedNaryUntil<T>* result = new BoundedNaryUntil<T>(); |
||||
|
if (left != NULL) { |
||||
|
result->setLeft(left->clone()); |
||||
|
} |
||||
|
if (right != NULL) { |
||||
|
std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* newright = new std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>(); |
||||
|
for (auto it = this->right->begin(); it != this->right->end(); ++it) { |
||||
|
newright->push_back(std::tuple<AbstractStateFormula<T>*,T,T>(std::get<0>(*it)->clone(), std::get<1>(*it), std::get<2>(*it))); |
||||
|
} |
||||
|
result->setRight(newright); |
||||
|
} |
||||
|
return result; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
/*! |
||||
|
* Calls the model checker to check this formula. |
||||
|
* Needed to infer the correct type of formula class. |
||||
|
* |
||||
|
* @note This function should only be called in a generic check function of a model checker class. For other uses, |
||||
|
* the methods of the model checker should be used. |
||||
|
* |
||||
|
* @returns A vector indicating the probability that the formula holds for each state. |
||||
|
*/ |
||||
|
virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const { |
||||
|
return modelChecker.template as<IBoundedNaryUntilModelChecker>()->checkBoundedNaryUntil(*this); |
||||
|
} |
||||
|
|
||||
|
/*! |
||||
|
* @brief Checks if all subtrees conform to some logic. |
||||
|
* |
||||
|
* @param checker Formula checker object. |
||||
|
* @return true iff all subtrees conform to some logic. |
||||
|
*/ |
||||
|
virtual bool conforms(const AbstractFormulaChecker<T>& checker) const { |
||||
|
bool res = checker.conforms(this->left); |
||||
|
for (auto it = this->right->begin(); it != this->right->end(); ++it) { |
||||
|
res &= checker.conforms(std::get<0>(*it)); |
||||
|
} |
||||
|
return res; |
||||
|
} |
||||
|
|
||||
|
private: |
||||
|
AbstractStateFormula<T>* left; |
||||
|
std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* right; |
||||
|
}; |
||||
|
|
||||
|
} //namespace formula |
||||
|
|
||||
|
} //namespace storm |
||||
|
|
||||
|
#endif /* STORM_FORMULA_BOUNDEDNARYUNTIL_H_ */ |
Some files were not shown because too many files changed in this diff
Reference in new issue
xxxxxxxxxx