From a22ec04f10415f2d2997be1ea8dde0bb7c6ba4d4 Mon Sep 17 00:00:00 2001 From: Tom Janson Date: Fri, 24 Feb 2017 22:57:51 +0100 Subject: [PATCH] fix old KSP test include actually still works fine --- src/test/utility/GraphTest.cpp | 1 - src/test/utility/KSPTest.cpp | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/test/utility/GraphTest.cpp b/src/test/utility/GraphTest.cpp index 051612984..ac646d99a 100644 --- a/src/test/utility/GraphTest.cpp +++ b/src/test/utility/GraphTest.cpp @@ -12,7 +12,6 @@ #include "storm/builder/DdPrismModelBuilder.h" #include "storm/builder/ExplicitModelBuilder.h" #include "storm/utility/graph.h" -#include "storm/utility/shortestPaths.cpp" #include "storm/storage/dd/Add.h" #include "storm/storage/dd/Bdd.h" #include "storm/storage/dd/DdManager.h" diff --git a/src/test/utility/KSPTest.cpp b/src/test/utility/KSPTest.cpp index 3d28ccae6..df8b4f212 100644 --- a/src/test/utility/KSPTest.cpp +++ b/src/test/utility/KSPTest.cpp @@ -6,15 +6,13 @@ #include "storm/parser/PrismParser.h" #include "storm/storage/SymbolicModelDescription.h" #include "storm/utility/graph.h" -#include "storm/utility/shortestPaths.cpp" +#include "storm/utility/shortestPaths.h" // NOTE: The KSPs / distances of these tests were generated by the // KSP-Generator itself and checked for gross implausibility, but no // more than that. // An independent verification of the values would be really nice ... -// FIXME: (almost) all of these fail; the question is: is there actually anything wrong or does the new parser yield a different order of states? - std::shared_ptr> buildExampleModel() { std::string prismModelPath = STORM_TEST_RESOURCES_DIR "/dtmc/brp-16-2.pm"; storm::storage::SymbolicModelDescription modelDescription = storm::parser::PrismParser::parse(prismModelPath); @@ -61,16 +59,12 @@ TEST(KSPTest, groupTarget) { auto groupTarget = std::vector{50, 90}; auto spg = storm::utility::ksp::ShortestPathsGenerator(*model, groupTarget); - // FIXME comments are outdated (but does it even matter?) - // this path should lead to 90 double dist1 = spg.getDistance(8); EXPECT_DOUBLE_EQ(0.00018449245583999996, dist1); - // this one to 50 double dist2 = spg.getDistance(9); EXPECT_DOUBLE_EQ(0.00018449245583999996, dist2); - // this one to 90 again double dist3 = spg.getDistance(12); EXPECT_DOUBLE_EQ(7.5303043199999984e-06, dist3); }