Fixed printing of float values and variables

Christian Schulte · Christian Schulte · commit e09ac9137359 · 2018-05-18T16:27:24.000+02:00
diff --git a/gecode/float/val.hpp b/gecode/float/val.hpp
@@ -358,7 +358,7 @@ namespace Gecode {
   template<class Char, class Traits>
   std::basic_ostream<Char,Traits>&
   operator <<(std::basic_ostream<Char,Traits>& os, const FloatVal& x) {
-    return os << x.x;
+    return os << '[' << x.min() << ".." << x.max() << ']';
   }
 
   forceinline FloatVal
diff --git a/gecode/float/view/print.hpp b/gecode/float/view/print.hpp
@@ -46,9 +46,9 @@ namespace Gecode { namespace Float {
     std::basic_ostringstream<Char,Traits> s;
     s.copyfmt(os); s.width(0);
     if (x.assigned()) {
-      s << x.med();
+      s << "[[" << x.med() << "]]";
     } else {
-      s << '[' << x.min() << ".." << x.max() << ']';
+      s << "[[" << x.min() << ".." << x.max() << "]]";
     }
     return os << s.str();
   }

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ namespace Gecode {`
`358`	`358`	`template<class Char, class Traits>`
`359`	`359`	`std::basic_ostream<Char,Traits>&`
`360`	`360`	`operator <<(std::basic_ostream<Char,Traits>& os, const FloatVal& x) {`
`361`		`- return os << x.x;`
	`361`	`+ return os << '[' << x.min() << ".." << x.max() << ']';`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`forceinline FloatVal`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ namespace Gecode { namespace Float {`
`46`	`46`	`std::basic_ostringstream<Char,Traits> s;`
`47`	`47`	`s.copyfmt(os); s.width(0);`
`48`	`48`	`if (x.assigned()) {`
`49`		`- s << x.med();`
	`49`	`+ s << "[[" << x.med() << "]]";`
`50`	`50`	`} else {`
`51`		`- s << '[' << x.min() << ".." << x.max() << ']';`
	`51`	`+ s << "[[" << x.min() << ".." << x.max() << "]]";`
`52`	`52`	`}`
`53`	`53`	`return os << s.str();`
`54`	`54`	`}`