From 6621cb814c72e701e08c84ba57de442a207f5101 Mon Sep 17 00:00:00 2001
From: TimQu <tim.quatmann@cs.rwth-aachen.de>
Date: Wed, 12 Jul 2017 10:42:04 +0200
Subject: [PATCH] new argument validator: doubleRangeValidatorIncluding

---
 src/storm/settings/ArgumentValidators.cpp | 9 +++++++++
 src/storm/settings/ArgumentValidators.h   | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/src/storm/settings/ArgumentValidators.cpp b/src/storm/settings/ArgumentValidators.cpp
index b8896590d..8e108b454 100644
--- a/src/storm/settings/ArgumentValidators.cpp
+++ b/src/storm/settings/ArgumentValidators.cpp
@@ -133,6 +133,10 @@ namespace storm {
             return createRangeValidatorExcluding<double>(lowerBound, upperBound);
         }
         
+        std::shared_ptr<ArgumentValidator<double>> ArgumentValidatorFactory::createDoubleRangeValidatorIncluding(double lowerBound, double upperBound) {
+            return createRangeValidatorIncluding<double>(lowerBound, upperBound);
+        }
+        
         std::shared_ptr<ArgumentValidator<int64_t>> ArgumentValidatorFactory::createIntegerGreaterValidator(int_fast64_t lowerBound) {
             return createGreaterValidator<int64_t>(lowerBound, false);
         }
@@ -174,6 +178,11 @@ namespace storm {
             return std::make_unique<RangeArgumentValidator<ValueType>>(lowerBound, upperBound, false, false);
         }
         
+        template <typename ValueType>
+        std::shared_ptr<ArgumentValidator<ValueType>> ArgumentValidatorFactory::createRangeValidatorIncluding(ValueType lowerBound, ValueType upperBound) {
+            return std::make_unique<RangeArgumentValidator<ValueType>>(lowerBound, upperBound, true, true);
+        }
+        
         template <typename ValueType>
         std::shared_ptr<ArgumentValidator<ValueType>> ArgumentValidatorFactory::createGreaterValidator(ValueType lowerBound, bool equalAllowed) {
             return std::make_unique<RangeArgumentValidator<ValueType>>(lowerBound, boost::none, equalAllowed, false);
diff --git a/src/storm/settings/ArgumentValidators.h b/src/storm/settings/ArgumentValidators.h
index bbdb861f5..4b3b0b3d8 100644
--- a/src/storm/settings/ArgumentValidators.h
+++ b/src/storm/settings/ArgumentValidators.h
@@ -70,6 +70,8 @@ namespace storm {
             static std::shared_ptr<ArgumentValidator<uint64_t>> createUnsignedRangeValidatorExcluding(uint64_t lowerBound, uint64_t upperBound);
             static std::shared_ptr<ArgumentValidator<double>> createDoubleRangeValidatorExcluding(double lowerBound, double upperBound);
             
+            static std::shared_ptr<ArgumentValidator<double>> createDoubleRangeValidatorIncluding(double lowerBound, double upperBound);
+            
             static std::shared_ptr<ArgumentValidator<int64_t>> createIntegerGreaterValidator(int_fast64_t lowerBound);
             static std::shared_ptr<ArgumentValidator<uint64_t>> createUnsignedGreaterValidator(uint64_t lowerBound);
             static std::shared_ptr<ArgumentValidator<double>> createDoubleGreaterValidator(double lowerBound);
@@ -87,6 +89,9 @@ namespace storm {
             template <typename ValueType>
             static std::shared_ptr<ArgumentValidator<ValueType>> createRangeValidatorExcluding(ValueType lowerBound, ValueType upperBound);
             
+            template <typename ValueType>
+            static std::shared_ptr<ArgumentValidator<ValueType>> createRangeValidatorIncluding(ValueType lowerBound, ValueType upperBound);
+            
             template <typename ValueType>
             static std::shared_ptr<ArgumentValidator<ValueType>> createGreaterValidator(ValueType lowerBound, bool equalAllowed);
         };