From 18bfe74d8f0e8b0c6d28a06670ab930894418262 Mon Sep 17 00:00:00 2001
From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de>
Date: Mon, 17 Feb 2020 09:28:02 +0100
Subject: [PATCH] api/model_descriptions: Fixed ambiguous method declaration.

---
 src/storm-parsers/api/model_descriptions.cpp | 13 -------------
 src/storm-parsers/api/model_descriptions.h   |  1 -
 2 files changed, 14 deletions(-)

diff --git a/src/storm-parsers/api/model_descriptions.cpp b/src/storm-parsers/api/model_descriptions.cpp
index 4213b9c52..b66855a25 100644
--- a/src/storm-parsers/api/model_descriptions.cpp
+++ b/src/storm-parsers/api/model_descriptions.cpp
@@ -22,19 +22,6 @@ namespace storm {
             return program;
         }
 
-        std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> parseJaniModel(std::string const& filename) {
-            storm::jani::ModelFeatures features;
-            // Add derived-operators and state-exit-rewards as these can be handled by all model builders
-            features.add(storm::jani::ModelFeature::DerivedOperators);
-            features.add(storm::jani::ModelFeature::StateExitRewards);
-            auto parsedResult = parseJaniModel(filename, features);
-            std::map<std::string, storm::jani::Property> propertyMap;
-            for (auto const& property : parsedResult.second) {
-                propertyMap.emplace(property.getName(), property);
-            }
-            return std::make_pair(std::move(parsedResult.first), std::move(propertyMap));
-        }
-        
         std::pair<storm::jani::Model, std::vector<storm::jani::Property>> parseJaniModel(std::string const& filename, boost::optional<std::vector<std::string>> const& propertyFilter) {
             bool parseProperties = !propertyFilter.is_initialized() || !propertyFilter.get().empty();
             std::pair<storm::jani::Model, std::vector<storm::jani::Property>> modelAndFormulae = storm::parser::JaniParser::parse(filename, parseProperties);
diff --git a/src/storm-parsers/api/model_descriptions.h b/src/storm-parsers/api/model_descriptions.h
index 0d094b44c..de098ee80 100644
--- a/src/storm-parsers/api/model_descriptions.h
+++ b/src/storm-parsers/api/model_descriptions.h
@@ -19,7 +19,6 @@ namespace storm {
         
         storm::prism::Program parseProgram(std::string const& filename, bool prismCompatibility = false, bool simplify = true);
         
-        std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> parseJaniModel(std::string const& filename);
         std::pair<storm::jani::Model, std::vector<storm::jani::Property>> parseJaniModel(std::string const& filename, boost::optional<std::vector<std::string>> const& propertyFilter = boost::none);
         std::pair<storm::jani::Model, std::vector<storm::jani::Property>> parseJaniModel(std::string const& filename, storm::jani::ModelFeatures const& allowedFeatures, boost::optional<std::vector<std::string>> const& propertyFilter = boost::none);
         void simplifyJaniModel(storm::jani::Model& model, std::vector<storm::jani::Property>& properties , storm::jani::ModelFeatures const& supportedFeatures);