From fb54edfb11be4e06a4761813a96e390909b5b88c Mon Sep 17 00:00:00 2001 From: TimQu Date: Fri, 23 Dec 2016 10:42:10 +0100 Subject: [PATCH] adapted pcaa tests to recent interface changes --- src/test/modelchecker/SparseMaPcaaModelCheckerTest.cpp | 2 +- .../modelchecker/SparseMdpPcaaModelCheckerTest.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/modelchecker/SparseMaPcaaModelCheckerTest.cpp b/src/test/modelchecker/SparseMaPcaaModelCheckerTest.cpp index 7a27733de..e29754ef3 100644 --- a/src/test/modelchecker/SparseMaPcaaModelCheckerTest.cpp +++ b/src/test/modelchecker/SparseMaPcaaModelCheckerTest.cpp @@ -58,7 +58,7 @@ TEST(SparseMaPcaaModelCheckerTest, server) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> ma = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> ma = storm::buildSparseModel(program, formulas)->as>(); storm::modelchecker::SparseMarkovAutomatonCslModelChecker> checker(*ma); std::unique_ptr result = storm::modelchecker::multiobjective::performPcaa(*ma, formulas[0]->asMultiObjectiveFormula()); diff --git a/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp b/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp index ae505d65f..4918f5c5b 100644 --- a/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp +++ b/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp @@ -23,7 +23,7 @@ TEST(SparseMdpPcaaModelCheckerTest, consensus) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> mdp = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> mdp = storm::buildSparseModel(program, formulas)->as>(); uint_fast64_t const initState = *mdp->getInitialStates().begin();; storm::modelchecker::SparseMdpPrctlModelChecker> checker(*mdp); @@ -51,7 +51,7 @@ TEST(SparseMdpPcaaModelCheckerTest, zeroconf) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> mdp = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> mdp = storm::buildSparseModel(program, formulas)->as>(); uint_fast64_t const initState = *mdp->getInitialStates().begin(); storm::modelchecker::SparseMdpPrctlModelChecker> checker(*mdp); @@ -70,7 +70,7 @@ TEST(SparseMdpPcaaModelCheckerTest, team3with3objectives) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> mdp = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> mdp = storm::buildSparseModel(program, formulas)->as>(); uint_fast64_t const initState = *mdp->getInitialStates().begin(); storm::modelchecker::SparseMdpPrctlModelChecker> checker(*mdp); @@ -89,7 +89,7 @@ TEST(SparseMdpPcaaModelCheckerTest, scheduler) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> mdp = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> mdp = storm::buildSparseModel(program, formulas)->as>(); uint_fast64_t const initState = *mdp->getInitialStates().begin(); storm::modelchecker::SparseMdpPrctlModelChecker> checker(*mdp); @@ -107,7 +107,7 @@ TEST(SparseMdpPcaaModelCheckerTest, dpm) { storm::prism::Program program = storm::parseProgram(programFile); program = storm::utility::prism::preprocess(program, ""); std::vector> formulas = storm::parseFormulasForPrismProgram(formulasAsString, program); - std::shared_ptr> mdp = storm::buildSparseModel(program, formulas, true)->as>(); + std::shared_ptr> mdp = storm::buildSparseModel(program, formulas)->as>(); uint_fast64_t const initState = *mdp->getInitialStates().begin(); storm::modelchecker::SparseMdpPrctlModelChecker> checker(*mdp);