Add function floorDiv

AntaresSimulatorTeam · Jan 9, 2025 · 93b4041 · 93b4041
1 parent d422b6d
commit 93b4041
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/libs/antares/utils/utils.cpp b/src/libs/antares/utils/utils.cpp
@@ -167,5 +167,10 @@ double ceilDiv(double numerator, double denominator)
     return std::ceil(std::round(numerator / denominator * largeValue) / largeValue);
 }
 
+double floorDiv(double numerator, double denominator)
+{
+    return std::floor(std::round(numerator / denominator * largeValue) / largeValue);
+}
+
 } // namespace Utils
 } // namespace Antares
diff --git a/src/solver/variable/state.cpp b/src/solver/variable/state.cpp
@@ -316,10 +316,8 @@ void State::yearEndBuildFromThermalClusterIndex(const uint clusterAreaWideIndex)
                            static_cast<uint>(
                              std::ceil(thermalClusterAvailableProduction
                                        / currentCluster->nominalCapacityWithSpinning))),
-                  static_cast<uint>(
-                    std::ceil(std::round(thermalClusterProduction
-                                         / currentCluster->nominalCapacityWithSpinning * 1000000)
-                              / 1000000)));
+                  static_cast<uint>(Utils::ceilDiv(thermalClusterProduction,
+                                                   currentCluster->nominalCapacityWithSpinning)));
             }
             else
             {
@@ -350,9 +348,8 @@ void State::yearEndBuildFromThermalClusterIndex(const uint clusterAreaWideIndex)
 
         if (currentCluster->minStablePower > 0.)
         {
-            maxUnitNeeded = static_cast<uint>(std::floor(
-              std::round(thermalClusterProduction / currentCluster->minStablePower * 1000000)
-              / 1000000));
+            maxUnitNeeded = static_cast<uint>(
+              Utils::floorDiv(thermalClusterProduction, currentCluster->minStablePower));
             if (ON_max[h] > maxUnitNeeded)
             {
                 ON_max[h] = maxUnitNeeded;