From 6ab286f4204ffcd83035d9dd60882c2b7d813933 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Thu, 24 Aug 2017 17:32:20 +0200 Subject: [PATCH] remove output, copy observability when modules are used --- src/storm/generator/NextStateGenerator.cpp | 2 -- src/storm/parser/PrismParser.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/storm/generator/NextStateGenerator.cpp b/src/storm/generator/NextStateGenerator.cpp index faaadf1ed..8d35f9cf2 100644 --- a/src/storm/generator/NextStateGenerator.cpp +++ b/src/storm/generator/NextStateGenerator.cpp @@ -158,9 +158,7 @@ namespace storm { uint32_t NextStateGenerator::observabilityClass(CompressedState const &state) const { if (this->mask.size() == 0) { this->mask = computeObservabilityMask(variableInformation); - std::cout << mask.size() << std::endl; } - std::cout << state.size() << std::endl; return unpackStateToObservabilityClass(state, observabilityMap, mask); } diff --git a/src/storm/parser/PrismParser.cpp b/src/storm/parser/PrismParser.cpp index ab850fb4d..759b3b140 100644 --- a/src/storm/parser/PrismParser.cpp +++ b/src/storm/parser/PrismParser.cpp @@ -631,7 +631,7 @@ namespace storm { for (auto const& variable : moduleToRename.getBooleanVariables()) { auto const& renamingPair = renaming.find(variable.getName()); STORM_LOG_THROW(renamingPair != renaming.end(), storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << ", line " << get_line(qi::_3) << ": Boolean variable '" << variable.getName() << " was not renamed."); - bool observable = false; // TODO + bool observable = variable.isObservable(); booleanVariables.push_back(storm::prism::BooleanVariable(manager->getVariable(renamingPair->second), variable.hasInitialValue() ? variable.getInitialValueExpression().substitute(expressionRenaming) : variable.getInitialValueExpression(), observable, this->getFilename(), get_line(qi::_1))); } @@ -640,7 +640,7 @@ namespace storm { for (auto const& variable : moduleToRename.getIntegerVariables()) { auto const& renamingPair = renaming.find(variable.getName()); STORM_LOG_THROW(renamingPair != renaming.end(), storm::exceptions::WrongFormatException, "Parsing error in " << this->getFilename() << ", line " << get_line(qi::_3) << ": Integer variable '" << variable.getName() << " was not renamed."); - bool observable = false; // TODO + bool observable = variable.isObservable(); integerVariables.push_back(storm::prism::IntegerVariable(manager->getVariable(renamingPair->second), variable.getLowerBoundExpression().substitute(expressionRenaming), variable.getUpperBoundExpression().substitute(expressionRenaming), variable.hasInitialValue() ? variable.getInitialValueExpression().substitute(expressionRenaming) : variable.getInitialValueExpression(), observable, this->getFilename(), get_line(qi::_1))); }