unification of some constructs in carl propagated to storm

Former-commit-id: 34ba08debf

src/adapters/CarlAdapter.h

@@ -12,8 +12,8 @@
 #include <carl/core/RationalFunction.h>
 #include <carl/core/VariablePool.h>
 #include <carl/core/FactorizedPolynomial.h>
-#include <carl/formula/Relation.h>
-#include <carl/formula/Formula.h>
+#include <carl/core/Relation.h>
+#include <carl/core/SimpleConstraint.h>
 
 namespace carl {
     // Define hash values for all polynomials and rational function.
@@ -48,8 +48,10 @@ namespace storm {
     typedef carl::MultivariatePolynomial<RationalNumber> RawPolynomial;
     typedef carl::FactorizedPolynomial<RawPolynomial> Polynomial;
     typedef carl::Relation CompareRelation;
+    
     typedef carl::RationalFunction<Polynomial> RationalFunction;
     typedef carl::Interval<double> Interval;
+    template<typename T> using ArithConstraint = carl::SimpleConstraint<T>;
 }
 
 #endif

src/models/sparse/Dtmc.cpp

@@ -189,12 +189,12 @@ namespace storm {
             }
             
             template<typename ValueType>
-            std::unordered_set<carl::Constraint<ValueType>> const& Dtmc<ValueType>::ConstraintCollector::getWellformedConstraints() const {
+            std::unordered_set<storm::ArithConstraint<ValueType>> const& Dtmc<ValueType>::ConstraintCollector::getWellformedConstraints() const {
                 return this->wellformedConstraintSet;
             }
             
             template<typename ValueType>
-            std::unordered_set<carl::Constraint<ValueType>> const& Dtmc<ValueType>::ConstraintCollector::getGraphPreservingConstraints() const {
+            std::unordered_set<storm::ArithConstraint<ValueType>> const& Dtmc<ValueType>::ConstraintCollector::getGraphPreservingConstraints() const {
                 return this->graphPreservingConstraintSet;
             }
             
@@ -207,7 +207,7 @@ namespace storm {
                         if (!comparator.isConstant(transition.getValue())) {
                             wellformedConstraintSet.emplace(transition.getValue() - 1, storm::CompareRelation::LEQ);
                             wellformedConstraintSet.emplace(transition.getValue(), storm::CompareRelation::GEQ);
-                            graphPreservingConstraintSet.emplace(transition.getValue(), storm::CompareRelation::GT);
+                            graphPreservingConstraintSet.emplace(transition.getValue(), storm::CompareRelation::GREATER);
                         }
                     }
                     STORM_LOG_ASSERT(!comparator.isConstant(sum) || comparator.isOne(sum), "If the sum is a constant, it must be equal to 1.");

src/models/sparse/Dtmc.h

@@ -63,11 +63,11 @@ namespace storm {
                 class ConstraintCollector {
                 private:
                     // A set of constraints that says that the DTMC actually has valid probability distributions in all states.
-                    std::unordered_set<carl::Constraint<ValueType>> wellformedConstraintSet;
+                    std::unordered_set<storm::ArithConstraint<ValueType>> wellformedConstraintSet;
                     
                     // A set of constraints that makes sure that the underlying graph of the model does not change depending
                     // on the parameter values.
-                    std::unordered_set<carl::Constraint<ValueType>> graphPreservingConstraintSet;
+                    std::unordered_set<storm::ArithConstraint<ValueType>> graphPreservingConstraintSet;
                     
                     // A comparator that is used for
                     storm::utility::ConstantsComparator<ValueType> comparator;
@@ -86,14 +86,14 @@ namespace storm {
                      *
                      * @return The set of wellformed-ness constraints.
                      */
-                    std::unordered_set<carl::Constraint<ValueType>> const&  getWellformedConstraints() const;
+                    std::unordered_set<storm::ArithConstraint<ValueType>> const&  getWellformedConstraints() const;
                     
                     /*!
                      * Returns the set of graph-preserving constraints.
                      *
                      * @return The set of graph-preserving constraints.
                      */
-                    std::unordered_set<carl::Constraint<ValueType>> const&  getGraphPreservingConstraints() const;
+                    std::unordered_set<storm::ArithConstraint<ValueType>> const&  getGraphPreservingConstraints() const;
                     
                     /*!
                      * Constructs the constraints for the given DTMC.

src/utility/cli.cpp

@@ -113,7 +113,6 @@ namespace storm {
                 std::cout << "Command line arguments: " << commandStream.str() << std::endl;
                 std::cout << "Current working directory: " << getCurrentWorkingDirectory() << std::endl << std::endl;
             }
-            }
             
             
             void printUsage() {

src/utility/cli.h

@@ -251,7 +251,7 @@ namespace storm {
             }
             
 #ifdef STORM_HAVE_CARL
-            void exportParametricResultToFile(storm::RationalFunction const& result, storm::models::sparse::Dtmc<storm::RationalFunction>::ConstraintCollector const& constraintCollector, std::string const& path) {
+            inline void exportParametricResultToFile(storm::RationalFunction const& result, storm::models::sparse::Dtmc<storm::RationalFunction>::ConstraintCollector const& constraintCollector, std::string const& path) {
                 std::ofstream filestream;
                 filestream.open(path);
                 // TODO: add checks.
@@ -261,9 +261,9 @@ namespace storm {
                 filestream << std::endl;
                 filestream << "!Result: " << result << std::endl;
                 filestream << "!Well-formed Constraints: " << std::endl;
-                std::copy(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::ostream_iterator<carl::Constraint<storm::RationalFunction>>(filestream, "\n"));
+                std::copy(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n"));
                 filestream << "!Graph-preserving Constraints: " << std::endl;
-                std::copy(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::ostream_iterator<carl::Constraint<storm::RationalFunction>>(filestream, "\n"));
+                std::copy(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::ostream_iterator<storm::ArithConstraint<storm::RationalFunction>>(filestream, "\n"));
                 filestream.close();
             }