From: Luca Heltai <luca.heltai@sissa.it>
Date: Fri, 21 Jul 2017 11:01:08 +0000 (+0200)
Subject: Specialise Bool pattern.
X-Git-Tag: v9.0.0-rc1~1391^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee374a679e53938c51f044c0dc7bce6013b4c738;p=dealii.git

Specialise Bool pattern.
---

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index b94d26861d..c5d0c4e015 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -1154,7 +1154,9 @@ namespace Patterns
 
       static std::unique_ptr<Patterns::PatternBase> to_pattern()
       {
-        if (std::is_integral<T>::value)
+        if (std::is_same<T,bool>::value)
+          return std_cxx14::make_unique<Patterns::Bool>();
+        else if (std::is_integral<T>::value)
           return std_cxx14::make_unique<Patterns::Integer>(
                    std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
         else if (std::is_floating_point<T>::value)
@@ -1169,6 +1171,8 @@ namespace Patterns
         std::string str;
         if (std::is_same<T, unsigned char>() || std::is_same<T, char>())
           str = std::to_string((int)value);
+        else  if (std::is_same<T,bool>::value)
+          str = value ? "true" : "false";
         else
           str = std::to_string(value);
         AssertThrow(p->match(str), ExcNoMatch(str, *p));
@@ -1180,27 +1184,32 @@ namespace Patterns
                           Convert<T>::to_pattern())
       {
         AssertThrow(p->match(s), ExcNoMatch(s, *p));
-        std::istringstream is(s);
         T value;
-        if (std::is_same<T, unsigned char>::value || std::is_same<T, char>::value)
+        if (std::is_same<T,bool>::value)
+          value = (s == "true");
+        else
           {
-            int i;
-            is >> i;
-            value = i;
+            std::istringstream is(s);
+            if (std::is_same<T, unsigned char>::value || std::is_same<T, char>::value)
+              {
+                int i;
+                is >> i;
+                value = i;
+              }
+            else
+              is >> value;
+
+            // If someone passes "123 abc" to the function, the method yelds an
+            // integer 123 alright, but the space terminates the read from the string
+            // although there is more to come. This case, however, is checked for in
+            // the call p->match(s) at the beginning of this function, and would
+            // throw earlier. Here it is safe to assume that if we didn't fail the
+            // conversion with the operator >>, then we are good to go.
+            AssertThrow(!is.fail(),
+                        ExcMessage("Failed to convert from \"" + s +
+                                   "\" to the type \"" +
+                                   boost::core::demangle(typeid(T).name()) + "\""));
           }
-        else
-          is >> value;
-
-        // If someone passes "123 abc" to the function, the method yelds an
-        // integer 123 alright, but the space terminates the read from the string
-        // although there is more to come. This case, however, is checked for in
-        // the call p->match(s) at the beginning of this function, and would
-        // throw earlier. Here it is safe to assume that if we didn't fail the
-        // conversion with the operator >>, then we are good to go.
-        AssertThrow(!is.fail(),
-                    ExcMessage("Failed to convert from \"" + s +
-                               "\" to the type \"" +
-                               boost::core::demangle(typeid(T).name()) + "\""));
         return value;
       }
     };
@@ -1318,7 +1327,6 @@ namespace Patterns
                                    const std::unique_ptr<Patterns::PatternBase>
                                    &pattern = Convert<T>::to_pattern())
       {
-
         auto p = dynamic_cast<const Patterns::List *>(pattern.get());
         AssertThrow(p, ExcMessage("I need a List pattern to convert a "
                                   "string to a List type."));
diff --git a/tests/base/pattern_tools_01.cc b/tests/base/pattern_tools_01.cc
index 8737715a5c..0a0542e711 100644
--- a/tests/base/pattern_tools_01.cc
+++ b/tests/base/pattern_tools_01.cc
@@ -49,12 +49,16 @@ int main()
   types::boundary_id  t2 = 3;
   std::string         t3 = "Ciao";
   double              t4 = 4.0;
+  bool                t5 = true;
+  float               t6 = 5.5;
 
   test(t0);
   test(t1);
   test(t2);
   test(t3);
   test(t4);
+  test(t5);
+  test(t6);
 
   return 0;
 }
diff --git a/tests/base/pattern_tools_01.output b/tests/base/pattern_tools_01.output
index 188c128ea8..6c2cf15ba7 100644
--- a/tests/base/pattern_tools_01.output
+++ b/tests/base/pattern_tools_01.output
@@ -18,3 +18,11 @@ DEAL::Type     : double
 DEAL::Pattern  : [Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]
 DEAL::To String: 4.000000
 DEAL::To value : 4.000000
+DEAL::Type     : bool
+DEAL::Pattern  : [Bool]
+DEAL::To String: true
+DEAL::To value : true
+DEAL::Type     : float
+DEAL::Pattern  : [Double -3.40282e+38...3.40282e+38 (inclusive)]
+DEAL::To String: 5.500000
+DEAL::To value : 5.500000