Browse Source

fixed a few cases where an exportet jani file may contain 'null'

tempestpy_adaptions
TimQu 6 years ago
parent
commit
2b1ef118d3
  1. 6
      src/storm/storage/jani/JSONExporter.cpp

6
src/storm/storage/jani/JSONExporter.cpp

@ -967,7 +967,7 @@ namespace storm {
modernjson::json buildDestinations(std::vector<EdgeDestination> const& destinations, std::map<uint64_t, std::string> const& locationNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, VariableSet const& localVariables, bool commentExpressions) { modernjson::json buildDestinations(std::vector<EdgeDestination> const& destinations, std::map<uint64_t, std::string> const& locationNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, VariableSet const& localVariables, bool commentExpressions) {
assert(destinations.size() > 0); assert(destinations.size() > 0);
modernjson::json destDeclarations;
modernjson::json destDeclarations = std::vector<modernjson::json>();
for(auto const& destination : destinations) { for(auto const& destination : destinations) {
modernjson::json destEntry; modernjson::json destEntry;
destEntry["location"] = locationNames.at(destination.getLocationIndex()); destEntry["location"] = locationNames.at(destination.getLocationIndex());
@ -992,7 +992,7 @@ namespace storm {
} }
modernjson::json buildEdges(std::vector<Edge> const& edges , std::map<uint64_t, std::string> const& actionNames, std::map<uint64_t, std::string> const& locationNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, VariableSet const& localVariables, bool commentExpressions) { modernjson::json buildEdges(std::vector<Edge> const& edges , std::map<uint64_t, std::string> const& actionNames, std::map<uint64_t, std::string> const& locationNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, VariableSet const& localVariables, bool commentExpressions) {
modernjson::json edgeDeclarations;
modernjson::json edgeDeclarations = std::vector<modernjson::json>();
for(auto const& edge : edges) { for(auto const& edge : edges) {
if (edge.getGuard().isFalse()) { if (edge.getGuard().isFalse()) {
continue; continue;
@ -1026,7 +1026,7 @@ namespace storm {
} }
modernjson::json buildAutomataArray(std::vector<storm::jani::Automaton> const& automata, std::map<uint64_t, std::string> const& actionNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, bool commentExpressions) { modernjson::json buildAutomataArray(std::vector<storm::jani::Automaton> const& automata, std::map<uint64_t, std::string> const& actionNames, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, bool commentExpressions) {
modernjson::json automataDeclarations;
modernjson::json automataDeclarations = std::vector<modernjson::json>();
for(auto const& automaton : automata) { for(auto const& automaton : automata) {
modernjson::json autoEntry; modernjson::json autoEntry;
autoEntry["name"] = automaton.getName(); autoEntry["name"] = automaton.getName();

Loading…
Cancel
Save