fix windows build

PREDICT-EPFL · Mar 2, 2024 · de52a1f · de52a1f
1 parent b19285b
commit de52a1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/include/piqp/dense/preconditioner.hpp b/include/piqp/dense/preconditioner.hpp
@@ -93,7 +93,7 @@ class RuizEquilibration
             delta_iter.setZero();
             delta_iter_lb.setZero();
             delta_iter_ub.setZero();
-            for (isize i = 0; i < max_iter && std::max({
+            for (isize i = 0; i < max_iter && (std::max)({
                     (1 - delta_iter.array()).matrix().template lpNorm<Eigen::Infinity>(),
                     (1 - delta_iter_lb.head(n_lb).array()).matrix().template lpNorm<Eigen::Infinity>(),
                     (1 - delta_iter_ub.head(n_ub).array()).matrix().template lpNorm<Eigen::Infinity>()
@@ -105,10 +105,10 @@ class RuizEquilibration
                 // [ G 0  0  ]
                 for (isize k = 0; k < n; k++)
                 {
-                    delta_iter(k) = std::max({data.P_utri.col(k).head(k).template lpNorm<Eigen::Infinity>(),
-                                              data.P_utri.row(k).tail(n - k).template lpNorm<Eigen::Infinity>(),
-                                              p > 0 ? data.AT.row(k).template lpNorm<Eigen::Infinity>() : T(0),
-                                              m > 0 ? data.GT.row(k).template lpNorm<Eigen::Infinity>() : T(0)});
+                    delta_iter(k) = (std::max)({data.P_utri.col(k).head(k).template lpNorm<Eigen::Infinity>(),
+                                                data.P_utri.row(k).tail(n - k).template lpNorm<Eigen::Infinity>(),
+                                                p > 0 ? data.AT.row(k).template lpNorm<Eigen::Infinity>() : T(0),
+                                                m > 0 ? data.GT.row(k).template lpNorm<Eigen::Infinity>() : T(0)});
                 }
                 for (isize k = 0; k < p; k++)
                 {

diff --git a/include/piqp/sparse/preconditioner.hpp b/include/piqp/sparse/preconditioner.hpp
@@ -91,7 +91,7 @@ class RuizEquilibration
             Vec<T>& delta_iter_lb = delta_lb_inv; // we use the memory of delta_lb_inv as temporary storage
             Vec<T>& delta_iter_ub = delta_ub_inv; // we use the memory of delta_ub_inv as temporary storage
             delta_iter.setZero();
-            for (isize i = 0; i < max_iter && std::max({
+            for (isize i = 0; i < max_iter && (std::max)({
                     (1 - delta_iter.array()).matrix().template lpNorm<Eigen::Infinity>(),
                     (1 - delta_iter_lb.head(n_lb).array()).matrix().template lpNorm<Eigen::Infinity>(),
                     (1 - delta_iter_ub.head(n_ub).array()).matrix().template lpNorm<Eigen::Infinity>()

diff --git a/tests/src/io_utils_test.cpp b/tests/src/io_utils_test.cpp
@@ -5,6 +5,7 @@
 // This source code is licensed under the BSD 2-Clause License found in the
 // LICENSE file in the root directory of this source tree.
 
+#define GHC_WITH_EXCEPTIONS
 #include "piqp/utils/filesystem.hpp"
 #include "piqp/utils/io_utils.hpp"
 #include "piqp/utils/random_utils.hpp"