sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Moved current tests to the functional test suite in an attempt to introduce performance tests.

tempestpy_adaptions
dehnert 12 years ago
parent
5f27a932a9
commit
27de566228
29 changed files with 12 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      CMakeLists.txt
  2. 2
      resources/3rdparty/cudd-2.5.0/Makefile
  3. 0
      test/functional/eigen/EigenSparseMatrixTest.cpp
  4. 6
      test/functional/modelchecker/EigenDtmcPrctModelCheckerTest.cpp
  5. 6
      test/functional/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
  6. 4
      test/functional/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
  7. 0
      test/functional/modelchecker/die/testFormulas.prctl
  8. 0
      test/functional/parser/.gitignore
  9. 0
      test/functional/parser/CslParserTest.cpp
  10. 0
      test/functional/parser/LtlParserTest.cpp
  11. 0
      test/functional/parser/ParseMdpTest.cpp
  12. 0
      test/functional/parser/ParsePrismTest.cpp
  13. 0
      test/functional/parser/PrctlParserTest.cpp
  14. 0
      test/functional/parser/ReadLabFileTest.cpp
  15. 0
      test/functional/parser/ReadTraFileTest.cpp
  16. 0
      test/functional/parser/prctl_files/apOnly.prctl
  17. 0
      test/functional/parser/prctl_files/complexFormula.prctl
  18. 0
      test/functional/parser/prctl_files/probabilisticFormula.prctl
  19. 0
      test/functional/parser/prctl_files/probabilisticNoBoundFormula.prctl
  20. 0
      test/functional/parser/prctl_files/propositionalFormula.prctl
  21. 0
      test/functional/parser/prctl_files/rewardFormula.prctl
  22. 0
      test/functional/parser/prctl_files/rewardNoBoundFormula.prctl
  23. 0
      test/functional/parser/readme.txt
  24. 0
      test/functional/storage/BitVectorTest.cpp
  25. 0
      test/functional/storage/SparseMatrixTest.cpp
  26. 0
      test/functional/storage/adapters/EigenAdapterTest.cpp
  27. 0
      test/functional/storage/adapters/GmmAdapterTest.cpp
  28. 0
      test/functional/storage/adapters/StormAdapterTest.cpp
  29. 0
      test/functional/storm-functional-tests.cpp

5
CMakeLists.txt
View File

@ -130,7 +130,7 @@ file(GLOB_RECURSE STORM_IR_FILES ${PROJECT_SOURCE_DIR}/src/ir/*.h ${PROJECT_SOUR
# Test Sources
# Note that the tests also need the source files, except for the main file
file(GLOB_RECURSE STORM_TEST_FILES ${PROJECT_SOURCE_DIR}/test/*.h ${PROJECT_SOURCE_DIR}/test/*.cpp)
file(GLOB_RECURSE STORM_FUNCTIONAL_TEST_FILES ${PROJECT_SOURCE_DIR}/test/functional/*.h ${PROJECT_SOURCE_DIR}/test/functional/*.cpp)
# Group the headers and sources
source_group(main FILES ${STORM_MAIN_FILE})
@ -226,7 +226,8 @@ endif(CUDD_LIBRARY_DIRS)
# Add the executables
# Must be created *after* Boost was added because of LINK_DIRECTORIES
add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS})
add_executable(storm-tests ${STORM_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS})
add_executable(storm-functional-tests ${STORM_FUNCTIONAL_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS})
add_executable(storm-performance-tests ${STORM_PERFORMANCE_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS})
# Add target link deps for Boost program options
target_link_libraries(storm ${Boost_LIBRARIES})

2
resources/3rdparty/cudd-2.5.0/Makefile
View File

@ -51,7 +51,7 @@ RANLIB = ranlib
#ICFLAGS =
# These two are typical settings for optimized code with gcc.
#ICFLAGS = -g -O3 -Wall
ICFLAGS = -O3
ICFLAGS = -O4
# Use XCFLAGS to specify machine-dependent compilation flags.
# For some platforms no special flags are needed.

0
test/eigen/EigenSparseMatrixTest.cpp → test/functional/eigen/EigenSparseMatrixTest.cpp
View File

6
test/functional/EigenDtmcPrctModelCheckerTest.cpp → test/functional/modelchecker/EigenDtmcPrctModelCheckerTest.cpp
View File

@ -9,7 +9,7 @@
TEST(EigenDtmcPrctModelCheckerTest, Die) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/die/die.tra", STORM_CPP_TESTS_BASE_PATH "/functional/die/die.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/die/die.coin_flips.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.coin_flips.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::DTMC);
@ -69,7 +69,7 @@ TEST(EigenDtmcPrctModelCheckerTest, Die) {
TEST(EigenDtmcPrctModelCheckerTest, Crowds) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/crowds/crowds5_5.tra", STORM_CPP_TESTS_BASE_PATH "/functional/crowds/crowds5_5.lab", "", "");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/crowds/crowds5_5.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/crowds/crowds5_5.lab", "", "");
ASSERT_EQ(parser.getType(), storm::models::DTMC);
@ -117,7 +117,7 @@ TEST(EigenDtmcPrctModelCheckerTest, Crowds) {
TEST(EigenDtmcPrctModelCheckerTest, SynchronousLeader) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.tra", STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.pick.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.pick.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::DTMC);

6
test/functional/GmmxxDtmcPrctModelCheckerTest.cpp → test/functional/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
View File

@ -8,7 +8,7 @@
TEST(GmmxxDtmcPrctModelCheckerTest, Die) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/die/die.tra", STORM_CPP_TESTS_BASE_PATH "/functional/die/die.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/die/die.coin_flips.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/die/die.coin_flips.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::DTMC);
@ -75,7 +75,7 @@ TEST(GmmxxDtmcPrctModelCheckerTest, Die) {
TEST(GmmxxDtmcPrctModelCheckerTest, Crowds) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/crowds/crowds5_5.tra", STORM_CPP_TESTS_BASE_PATH "/functional/crowds/crowds5_5.lab", "", "");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/crowds/crowds5_5.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/crowds/crowds5_5.lab", "", "");
ASSERT_EQ(parser.getType(), storm::models::DTMC);
@ -129,7 +129,7 @@ TEST(GmmxxDtmcPrctModelCheckerTest, Crowds) {
TEST(GmmxxDtmcPrctModelCheckerTest, SynchronousLeader) {
storm::settings::Settings* s = storm::settings::instance();
s->set("fix-deadlocks");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.tra", STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/synchronous_leader/leader4_8.pick.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/synchronous_leader/leader4_8.pick.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::DTMC);

4
test/functional/GmmxxMdpPrctModelCheckerTest.cpp → test/functional/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
View File

@ -7,7 +7,7 @@
TEST(GmmxxMdpPrctModelCheckerTest, Dice) {
storm::settings::Settings* s = storm::settings::instance();
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/two_dice/two_dice.tra", STORM_CPP_TESTS_BASE_PATH "/functional/two_dice/two_dice.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/two_dice/two_dice.flip.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "functional/modelchecker/two_dice/two_dice.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/two_dice/two_dice.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/two_dice/two_dice.flip.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::MDP);
@ -171,7 +171,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Dice) {
TEST(GmmxxMdpPrctModelCheckerTest, AsynchronousLeader) {
storm::settings::Settings* s = storm::settings::instance();
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/asynchronous_leader/leader4.tra", STORM_CPP_TESTS_BASE_PATH "/functional/asynchronous_leader/leader4.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/asynchronous_leader/leader4.trans.rew");
storm::parser::AutoParser<double> parser(STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/asynchronous_leader/leader4.tra", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/asynchronous_leader/leader4.lab", "", STORM_CPP_TESTS_BASE_PATH "/functional/modelchecker/asynchronous_leader/leader4.trans.rew");
ASSERT_EQ(parser.getType(), storm::models::MDP);

0
test/functional/die/testFormulas.prctl → test/functional/modelchecker/die/testFormulas.prctl
View File

0
test/parser/.gitignore → test/functional/parser/.gitignore
View File

0
test/parser/CslParserTest.cpp → test/functional/parser/CslParserTest.cpp
View File

0
test/parser/LtlParserTest.cpp → test/functional/parser/LtlParserTest.cpp
View File

0
test/parser/ParseMdpTest.cpp → test/functional/parser/ParseMdpTest.cpp
View File

0
test/parser/ParsePrismTest.cpp → test/functional/parser/ParsePrismTest.cpp
View File

0
test/parser/PrctlParserTest.cpp → test/functional/parser/PrctlParserTest.cpp
View File

0
test/parser/ReadLabFileTest.cpp → test/functional/parser/ReadLabFileTest.cpp
View File

0
test/parser/ReadTraFileTest.cpp → test/functional/parser/ReadTraFileTest.cpp
View File

0
test/parser/prctl_files/apOnly.prctl → test/functional/parser/prctl_files/apOnly.prctl
View File

0
test/parser/prctl_files/complexFormula.prctl → test/functional/parser/prctl_files/complexFormula.prctl
View File

0
test/parser/prctl_files/probabilisticFormula.prctl → test/functional/parser/prctl_files/probabilisticFormula.prctl
View File

0
test/parser/prctl_files/probabilisticNoBoundFormula.prctl → test/functional/parser/prctl_files/probabilisticNoBoundFormula.prctl
View File

0
test/parser/prctl_files/propositionalFormula.prctl → test/functional/parser/prctl_files/propositionalFormula.prctl
View File

0
test/parser/prctl_files/rewardFormula.prctl → test/functional/parser/prctl_files/rewardFormula.prctl
View File

0
test/parser/prctl_files/rewardNoBoundFormula.prctl → test/functional/parser/prctl_files/rewardNoBoundFormula.prctl
View File

0
test/parser/readme.txt → test/functional/parser/readme.txt
View File

0
test/storage/BitVectorTest.cpp → test/functional/storage/BitVectorTest.cpp
View File

0
test/storage/SparseMatrixTest.cpp → test/functional/storage/SparseMatrixTest.cpp
View File

0
test/storage/adapters/EigenAdapterTest.cpp → test/functional/storage/adapters/EigenAdapterTest.cpp
View File

0
test/storage/adapters/GmmAdapterTest.cpp → test/functional/storage/adapters/GmmAdapterTest.cpp
View File

0
test/storage/adapters/StormAdapterTest.cpp → test/functional/storage/adapters/StormAdapterTest.cpp
View File

0
test/storm-tests.cpp → test/functional/storm-functional-tests.cpp
View File

Write Preview
Loading…
Cancel
Save