vcpkg

AntaresSimulatorTeam · Jan 8, 2025 · ab844ac · ab844ac
1 parent 6333550
commit ab844ac
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/src/solver/variable/include/antares/solver/variable/economy/max-mrg-utils.h b/src/solver/variable/include/antares/solver/variable/economy/max-mrg-utils.h
@@ -11,7 +11,7 @@ struct MaxMRGinput
 {
     double* spillage = nullptr;
     double* dens = nullptr;
-    double* hydroGeneration = nullptr;
+    std::vector<double> hydroGeneration;
     Antares::Data::TimeSeries* maxHourlyGenPower = nullptr;
     double* dtgMargin = nullptr;
     unsigned int hourInYear = 0;

diff --git a/...solver/variable/include/antares/solver/variable/economy/reserveParticipationByLTStorage.h b/...solver/variable/include/antares/solver/variable/economy/reserveParticipationByLTStorage.h
@@ -210,10 +210,11 @@ void localBuildAnnualSurveyReport(SurveyResults& results,
                 {
                     auto reserveName = results.data.area->reserveParticipationIndexMaps()
                                          .LTStorage.get(i);
-                    results.variableCaption = "LongTermStorage_" + reserveName; // VCardType::Caption();
+                    results.variableCaption = reserveName
+                                              + "_LongTermStorage"; // VCardType::Caption();
                     results.variableUnit = VCardType::Unit();
-                    pValuesForTheCurrentYear[numSpace][0].template buildAnnualSurveyReport<VCardType>(
-                        results, fileLevel, precision);
+                    pValuesForTheCurrentYear[numSpace][i]
+                      .template buildAnnualSurveyReport<VCardType>(results, fileLevel, precision);
                 }
             }
         }

diff --git a/...solver/variable/include/antares/solver/variable/economy/reserveParticipationBySTStorage.h b/...solver/variable/include/antares/solver/variable/economy/reserveParticipationBySTStorage.h
@@ -271,11 +271,11 @@ class ReserveParticipationBySTStorage
                     && results.data.area->reserveParticipationIndexMaps()
                          .STStorageClusters.size()) // Bimap is not empty
                 {
-                    auto [clusterName, reserveName] = results.data.area
+                    auto [reserveName, clusterName] = results.data.area
                                                         ->reserveParticipationIndexMaps()
                                                         .STStorageClusters.get(i);
                     // Write the data for the current year
-                    results.variableCaption = clusterName + "_" + reserveName; // VCardType::Caption();
+                    results.variableCaption = reserveName + "_" + clusterName; // VCardType::Caption();
                     results.variableUnit = VCardType::Unit();
                     pValuesForTheCurrentYear[numSpace][i].template buildAnnualSurveyReport<VCardType>(
                         results, fileLevel, precision);

diff --git a/src/solver/variable/max-mrg-utils.cpp b/src/solver/variable/max-mrg-utils.cpp
@@ -43,14 +43,11 @@ MaxMrgDataFactory::MaxMrgDataFactory(const State& state, unsigned int numSpace):
     numSpace_(numSpace),
     weeklyResults_(state.problemeHebdo->ResultatsHoraires[state.area->index])
 {
-    std::vector<double> hydroGeneration;
-    hydroGeneration.reserve(weeklyResults_.HydroUsage.size());
     std::transform(weeklyResults_.HydroUsage.begin(),
                    weeklyResults_.HydroUsage.end(),
-                   std::back_inserter(hydroGeneration),
+                   std::back_inserter(maxMRGinput_.hydroGeneration),
                    [](const OPTIMAL_HYDRO_USAGE& s) { return s.TurbinageHoraire; });
 
-    maxMRGinput_.hydroGeneration = hydroGeneration.data();
     maxMRGinput_.maxHourlyGenPower = &state_.area->hydro.series->maxHourlyGenPower;
     maxMRGinput_.dtgMargin = state_.area->scratchpad[numSpace].dispatchableGenerationMargin;
     maxMRGinput_.hourInYear = state.hourInTheYear;

diff --git a/src/vcpkg.json b/src/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "antares-simulator",
   "version-string": "9.2.0",
-  "builtin-baseline": "9484a57dd560b89f0a583be08af6753611c57fd5",
+  "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
   "vcpkg-configuration": {
     "overlay-ports": [
       "./ports"
@@ -21,11 +21,11 @@
     },
     {
       "name": "boost-test",
-      "version>=": "1.81.0"
+      "version>=": "1.86.0"
     },
     {
       "name": "boost-core",
-      "version>=": "1.81.0"
+      "version>=": "1.86.0"
     },
     {
       "name": "minizip-ng",

diff --git a/vcpkg b/vcpkg