code smells

AntaresSimulatorTeam · Oct 16, 2024 · ae979cb · ae979cb
1 parent 6bc87fc
commit ae979cb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/src/libs/antares/study/area/links.cpp b/src/libs/antares/study/area/links.cpp
@@ -75,7 +75,7 @@ AreaLink::~AreaLink()
 
 bool AreaLink::linkLoadTimeSeries_for_version_below_810(const fs::path& folder)
 {
-    fs::path path = folder / std::string(with->id + ".txt");
+    fs::path path = folder / static_cast<std::string>(with->id + ".txt");
 
     // Load link's data
     Matrix<> tmpMatrix;
@@ -120,11 +120,11 @@ bool AreaLink::linkLoadTimeSeries_for_version_820_and_later(const fs::path& fold
     fs::path capacitiesFolder = folder / "capacities";
 
     // Read link's direct capacities time series
-    path = capacitiesFolder / std::string(with->id + "_direct.txt");
+    path = capacitiesFolder / static_cast<std::string>(with->id + "_direct.txt");
     success = directCapacities.loadFromFile(path, false) && success;
 
     // Read link's indirect capacities time series
-    path = capacitiesFolder / std::string(with->id + "_indirect.txt");
+    path = capacitiesFolder / static_cast<std::string>(with->id + "_indirect.txt");
     success = indirectCapacities.loadFromFile(path, false) && success;
 
     return success;

diff --git a/src/libs/antares/study/parts/hydro/prepro.cpp b/src/libs/antares/study/parts/hydro/prepro.cpp
@@ -155,9 +155,7 @@ bool PreproHydro::loadFromFolder(Study& s, const std::string& areaID, const fs::
     };
 
     constexpr int maxNbOfLineToLoad = 12;
-
     data.resize(hydroPreproMax, 12, true);
-    String& buffer = s.bufferLoadingTS;
 
     fs::path preproPath = folder / areaID / "prepro.ini";
     bool ret = PreproHydroLoadSettings(this, preproPath);

diff --git a/src/solver/ts-generator/hydro.cpp b/src/solver/ts-generator/hydro.cpp
@@ -281,7 +281,7 @@ bool GenerateHydroTimeSeries(Data::Study& study, uint currentYear, Solver::IResu
         {
             logs.info() << "Archiving the hydro time-series";
             study.areas.each(
-              [&study, &currentYear, &writer, &progression](const Data::Area& area)
+              [&currentYear, &writer, &progression](const Data::Area& area)
               {
                   const int precision = 0;
                   std::string mcYear = "mc-" + currentYear;

diff --git a/src/solver/variable/include/antares/solver/variable/container.hxx b/src/solver/variable/include/antares/solver/variable/container.hxx
@@ -251,7 +251,8 @@ void List<NextT>::buildSurveyReport(SurveyResults& results,
 
     // The new filename
     results.data.filename.clear();
-    results.data.filename << std::filesystem::path(std::string(results.data.output)) / "";
+    results.data.filename << std::filesystem::path(static_cast<std::string>(results.data.output))
+                               / "";
     Category::FileLevelToStream(results.data.filename, fileLevel);
     results.data.filename << '-';
     Category::PrecisionLevelToStream(results.data.filename, precision);
@@ -280,7 +281,8 @@ void List<NextT>::buildAnnualSurveyReport(SurveyResults& results,
 
     // The new filename
     results.data.filename.clear();
-    results.data.filename << std::filesystem::path(std::string(results.data.output)) / "";
+    results.data.filename << std::filesystem::path(static_cast<std::string>(results.data.output))
+                               / "";
     Category::FileLevelToStream(results.data.filename, fileLevel);
     results.data.filename << '-';
     Category::PrecisionLevelToStream(results.data.filename, precision);

diff --git a/src/solver/variable/include/antares/solver/variable/surveyresults/reportbuilder.hxx b/src/solver/variable/include/antares/solver/variable/surveyresults/reportbuilder.hxx
@@ -270,7 +270,7 @@ public:
         }
         // THIS FILE IS DEPRECATED !!!
         YString digestFileName;
-        std::filesystem::path path = std::string(results.data.originalOutput);
+        std::filesystem::path path = static_cast<std::string>(results.data.originalOutput);
         path /= "grid";
         path /= "digest.txt";
         writer.addEntryFromBuffer(path, digestBuffer);
@@ -320,7 +320,7 @@ private:
             {
                 logs.info() << "Exporting results : " << area.name;
                 // The new output
-                std::filesystem::path path = std::string(results.data.originalOutput);
+                std::filesystem::path path = static_cast<std::string>(results.data.originalOutput);
                 path /= "areas";
                 path /= area.id.to<std::string>();
 
@@ -356,7 +356,7 @@ private:
 
                 logs.info() << "Exporting results : " << area.name << " :: " << cluster->name();
                 // The new output
-                std::filesystem::path path = std::string(results.data.originalOutput);
+                std::filesystem::path path = static_cast<std::string>(results.data.originalOutput);
                 path /= std::filesystem::path("areas") / area.id.to<std::string>() / "thermal"
                         / cluster->id();
 
@@ -409,8 +409,10 @@ private:
                     Antares::logs.info() << "Exporting results : " << area.name << " - "
                                          << results.data.link->with->name;
                     // The new output
-                    std::filesystem::path path = std::string(results.data.originalOutput);
-                    std::string areaId = std::string(area.id) + " - " + results.data.link->with->id;
+                    std::filesystem::path path = static_cast<std::string>(
+                      results.data.originalOutput);
+                    std::string areaId = static_cast<std::string>(area.id) + " - "
+                                         + results.data.link->with->id;
                     path /= std::filesystem::path("links") / areaId;
 
                     results.data.output = path.string();
@@ -456,7 +458,7 @@ private:
 
             logs.info() << "Exporting results : " << sets.caption(i);
             // The new output
-            std::filesystem::path path = std::string(results.data.originalOutput);
+            std::filesystem::path path = static_cast<std::string>(results.data.originalOutput);
             std::string setId = "@ " + sets.nameByIndex(i);
             path /= std::filesystem::path("areas") / setId;
 
@@ -478,7 +480,7 @@ private:
         {
             logs.info() << "Exporting results : binding constraints";
             // The new output
-            std::filesystem::path path = std::string(results.data.originalOutput);
+            std::filesystem::path path = static_cast<std::string>(results.data.originalOutput);
             path /= "binding_constraints";
 
             results.data.output = path.string();