From fba3223f63a8fa1850a1c354b0a77a2f3b423355 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Fri, 2 Aug 2019 20:33:54 +0200 Subject: [PATCH] Use typedefs of RationalFunctionAdapter --- src/storm/builder/DdJaniModelBuilder.cpp | 12 ++++++------ src/storm/builder/DdPrismModelBuilder.cpp | 12 ++++++------ .../builder/jit/ExplicitJitJaniModelBuilder.cpp | 10 +++++----- src/storm/builder/jit/ExplicitJitJaniModelBuilder.h | 2 +- .../expressions/ToRationalFunctionVisitor.cpp | 4 ++-- .../storage/expressions/ToRationalFunctionVisitor.h | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/storm/builder/DdJaniModelBuilder.cpp b/src/storm/builder/DdJaniModelBuilder.cpp index a9b4f62b9..f05199ccc 100644 --- a/src/storm/builder/DdJaniModelBuilder.cpp +++ b/src/storm/builder/DdJaniModelBuilder.cpp @@ -156,14 +156,14 @@ namespace storm { template class ParameterCreator { public: - ParameterCreator() : cache(std::make_shared>>()) { + ParameterCreator() : cache(std::make_shared()) { // Intentionally left empty. } void create(storm::jani::Model const& model, storm::adapters::AddExpressionAdapter& rowExpressionAdapter) { for (auto const& constant : model.getConstants()) { if (!constant.isDefined()) { - carl::Variable carlVariable = carl::freshRealVariable(constant.getExpressionVariable().getName()); + storm::RationalFunctionVariable carlVariable = carl::freshRealVariable(constant.getExpressionVariable().getName()); parameters.insert(carlVariable); auto rf = convertVariableToPolynomial(carlVariable); rowExpressionAdapter.setValue(constant.getExpressionVariable(), rf); @@ -172,12 +172,12 @@ namespace storm { } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(typename RationalFunctionType::PolyType(typename RationalFunctionType::PolyType::PolyType(variable), cache)); } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(variable); } @@ -187,10 +187,10 @@ namespace storm { private: // A mapping from our variables to carl's. - std::unordered_map variableToVariableMap; + std::unordered_map variableToVariableMap; // The cache that is used in case the underlying type needs a cache. - std::shared_ptr>> cache; + std::shared_ptr cache; // All created parameters. std::set parameters; diff --git a/src/storm/builder/DdPrismModelBuilder.cpp b/src/storm/builder/DdPrismModelBuilder.cpp index eea14d863..83905937c 100644 --- a/src/storm/builder/DdPrismModelBuilder.cpp +++ b/src/storm/builder/DdPrismModelBuilder.cpp @@ -49,14 +49,14 @@ namespace storm { template class ParameterCreator { public: - ParameterCreator() : cache(std::make_shared>>()) { + ParameterCreator() : cache(std::make_shared()) { // Intentionally left empty. } void create(storm::prism::Program const& program, storm::adapters::AddExpressionAdapter& rowExpressionAdapter) { for (auto const& constant : program.getConstants()) { if (!constant.isDefined()) { - carl::Variable carlVariable = carl::freshRealVariable(constant.getExpressionVariable().getName()); + storm::RationalFunctionVariable carlVariable = carl::freshRealVariable(constant.getExpressionVariable().getName()); parameters.insert(carlVariable); auto rf = convertVariableToPolynomial(carlVariable); rowExpressionAdapter.setValue(constant.getExpressionVariable(), rf); @@ -65,12 +65,12 @@ namespace storm { } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(typename RationalFunctionType::PolyType(typename RationalFunctionType::PolyType::PolyType(variable), cache)); } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(variable); } @@ -80,10 +80,10 @@ namespace storm { private: // A mapping from our variables to carl's. - std::unordered_map variableToVariableMap; + std::unordered_map variableToVariableMap; // The cache that is used in case the underlying type needs a cache. - std::shared_ptr>> cache; + std::shared_ptr cache; // All created parameters. std::set parameters; diff --git a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp index 67852f292..43fdfccc7 100644 --- a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp +++ b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp @@ -2522,22 +2522,22 @@ namespace storm { } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable, std::shared_ptr>> cache) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable, std::shared_ptr cache) { return RationalFunctionType(typename RationalFunctionType::PolyType(typename RationalFunctionType::PolyType::PolyType(variable), cache)); } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable, std::shared_ptr>>) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable, std::shared_ptr) { return RationalFunctionType(variable); } template - std::vector getParameters(storm::jani::Model const&, std::shared_ptr>>) { + std::vector getParameters(storm::jani::Model const&, std::shared_ptr) { STORM_LOG_THROW(false, storm::exceptions::InvalidStateException, "This function must not be called for this type."); } template<> - std::vector getParameters(storm::jani::Model const& model, std::shared_ptr>> cache) { + std::vector getParameters(storm::jani::Model const& model, std::shared_ptr cache) { std::vector parameters; for (auto const& constant : model.getConstants()) { if (!constant.isDefined() && constant.isRealConstant()) { @@ -2557,7 +2557,7 @@ namespace storm { typedef boost::function ImportInitializeParametersFunctionType; // Create the carl cache if we are building a parametric model. - cache = std::make_shared>>(); + cache = std::make_shared(); ImportInitializeParametersFunctionType initializeParametersFunction = boost::dll::import_alias(dynamicLibraryPath, "initialize_parameters"); std::vector parameters = getParameters(this->model, cache); diff --git a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h index 3c5c4a4ce..cb2247d35 100644 --- a/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h +++ b/src/storm/builder/jit/ExplicitJitJaniModelBuilder.h @@ -202,7 +202,7 @@ namespace storm { std::string gmpIncludeDirectory; /// A cache that is used by carl. - std::shared_ptr>> cache; + std::shared_ptr cache; }; } diff --git a/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp b/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp index 38d5850c3..21ee060ea 100644 --- a/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp +++ b/src/storm/storage/expressions/ToRationalFunctionVisitor.cpp @@ -11,7 +11,7 @@ namespace storm { #ifdef STORM_HAVE_CARL template - ToRationalFunctionVisitor::ToRationalFunctionVisitor(ExpressionEvaluatorBase const& evaluator) : ExpressionVisitor(), cache(new carl::Cache>()), evaluator(evaluator) { + ToRationalFunctionVisitor::ToRationalFunctionVisitor(ExpressionEvaluatorBase const& evaluator) : ExpressionVisitor(), cache(new storm::RawPolynomialCache()), evaluator(evaluator) { // Intentionally left empty. } @@ -82,7 +82,7 @@ namespace storm { if (variablePair != variableToVariableMap.end()) { return convertVariableToPolynomial(variablePair->second); } else { - carl::Variable carlVariable = carl::freshRealVariable(expression.getVariableName()); + storm::RationalFunctionVariable carlVariable = carl::freshRealVariable(expression.getVariableName()); variableToVariableMap.emplace(expression.getVariable(), carlVariable); return convertVariableToPolynomial(carlVariable); } diff --git a/src/storm/storage/expressions/ToRationalFunctionVisitor.h b/src/storm/storage/expressions/ToRationalFunctionVisitor.h index 25797322f..fa5d5f36b 100644 --- a/src/storm/storage/expressions/ToRationalFunctionVisitor.h +++ b/src/storm/storage/expressions/ToRationalFunctionVisitor.h @@ -37,20 +37,20 @@ namespace storm { private: template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(typename RationalFunctionType::PolyType(typename RationalFunctionType::PolyType::PolyType(variable), cache)); } template> = carl::dummy> - RationalFunctionType convertVariableToPolynomial(carl::Variable const& variable) { + RationalFunctionType convertVariableToPolynomial(storm::RationalFunctionVariable const& variable) { return RationalFunctionType(variable); } // A mapping from our variables to carl's. - std::unordered_map variableToVariableMap; + std::unordered_map variableToVariableMap; // The cache that is used in case the underlying type needs a cache. - std::shared_ptr>> cache; + std::shared_ptr cache; // A mapping from variables to their values. std::unordered_map valueMapping;