non-type template arguments of type double not yet supported

LoopModels · Feb 16, 2024 · 577fa4e · 577fa4e
1 parent 0234225
commit 577fa4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/include/Math/BoxOptInt.hpp b/include/Math/BoxOptInt.hpp
@@ -34,7 +34,8 @@ constexpr auto bound(alloc::Arena<> *alloc, BoxTransform &box, double upper,
 constexpr auto
 minimizeIntSol(alloc::Arena<> *alloc, MutPtrVector<int32_t> r,
                poly::math::BoxTransform &box, const auto &f,
-               double globalupper = std::numeric_limits<double>::infinity()) {
+               double globalupper = std::numeric_limits<double>::infinity())
+  -> double {
   // goal is to shrink all bounds such that lb==ub, i.e. we have all
   // integer solutions.
   if (minimize(alloc, box, f) >= globalupper) return globalupper;
@@ -50,7 +51,8 @@ minimizeIntSol(alloc::Arena<> *alloc, MutPtrVector<int32_t> r,
 constexpr auto
 minimizeIntSol(alloc::Arena<> *alloc, MutPtrVector<int32_t> r, int32_t lb,
                int32_t ub, const auto &f,
-               double globalupper = std::numeric_limits<double>::infinity()) {
+               double globalupper = std::numeric_limits<double>::infinity())
+  -> double {
   // goal is to shrink all bounds such that lb==ub, i.e. we have all
   // integer solutions.
   unsigned N = r.size();

diff --git a/include/Math/Exp.hpp b/include/Math/Exp.hpp
@@ -422,17 +422,17 @@ constexpr auto sigmoid(double x) -> double { return 1.0 / (1.0 + exp(-x)); }
 constexpr auto softplus(double x) -> double { return log1p(exp(x)); }
 constexpr auto logit(double x) -> double { return log(x / (1.0 - x)); }
 
-template <double l = 8.0> constexpr auto smax(auto x, auto y) {
+template <int l = 8> constexpr auto smax(auto x, auto y) {
   auto d = x > y ? y - x : x - y;
   auto o = x > y ? decltype(d)(x) : decltype(d)(y);
   return o + softplus(l * d) / l;
 }
 
-template <double l = 8.0> constexpr auto smax(auto x, auto y, auto z) {
+template <int l = 8> constexpr auto smax(auto x, auto y, auto z) {
   double m = std::max(std::max(value(x), value(y)), value(z));
   return m + log(exp(l * (x - m)) + exp(l * (y - m)) + exp(l * (z - m))) / l;
 }
-template <double l = 8.0> constexpr auto smin(auto x, auto y) {
+template <int l = 8> constexpr auto smin(auto x, auto y) {
   return smax<-l>(x, y);
 }