Fixing bugs

rmcantin · rmcantin · commit b8e5e9ab8fee · 2017-10-09T16:46:13.000+02:00
diff --git a/include/mean_atomic.hpp b/include/mean_atomic.hpp
@@ -22,7 +22,7 @@
 */
 
 #ifndef  _MEAN_ATOMIC_HPP_
-#define  _MEAN_ATOMIC_HPP__
+#define  _MEAN_ATOMIC_HPP_
 
 #include <boost/numeric/ublas/vector_proxy.hpp>
 #include "mean_functors.hpp"
diff --git a/python/demo_quad.py b/python/demo_quad.py
@@ -19,6 +19,7 @@
 #    along with BayesOpt.  If not, see <http://www.gnu.org/licenses/>.
 # ------------------------------------------------------------------------
 
+import sys
 import bayesopt
 from bayesoptmodule import BayesOptContinuous
 import numpy as np
diff --git a/utils/fileparser.hpp b/utils/fileparser.hpp
@@ -120,7 +120,7 @@ namespace bayesopt
         {
             std::istringstream ss(str);
             T result;
-            return ss >> std::setprecision(precision) >> result ? result : 0;
+            return (ss >> std::setprecision(precision) >> result) ? result : 0;
         }
     private:
         /* Search variables in file */

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ namespace bayesopt`
`120`	`120`	`{`
`121`	`121`	`std::istringstream ss(str);`
`122`	`122`	`T result;`
`123`		`- return ss >> std::setprecision(precision) >> result ? result : 0;`
	`123`	`+ return (ss >> std::setprecision(precision) >> result) ? result : 0;`
`124`	`124`	`}`
`125`	`125`	`private:`
`126`	`126`	`/* Search variables in file */`