Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
@payetvin
payetvin committed Jul 1, 2024
1 parent d7846b0 commit 4728afd
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 32 deletions.
3 changes: 2 additions & 1 deletion src/libs/antares/date/date.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@

#include <cassert>

#include <boost/algorithm/string/case_conv.hpp>

#include <yuni/yuni.h>
#include <yuni/core/string.h>
#include <yuni/io/file.h>
#include <boost/algorithm/string/case_conv.hpp>

#include <antares/date/date.h>
#include <antares/logs/logs.h>
Expand Down
1 change: 0 additions & 1 deletion src/solver/simulation/include/antares/solver/simulation/solver.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <antares/exception/InitializationError.hpp>
#include <antares/logs/logs.h>
#include "antares/concurrency/concurrency.h"
#include "antares/solver/variable/print.h"
#include "antares/solver/hydro/management/HydroInputsChecker.h"
#include "antares/solver/hydro/management/management.h"
#include "antares/solver/simulation/opt_time_writer.h"
Expand Down
4 changes: 2 additions & 2 deletions src/solver/variable/include/antares/solver/variable/economy/productionByDispatchablePlant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ class ProductionByDispatchablePlant
pValuesForTheCurrentYear[numSpace][cluster->areaWideIndex].hour[state.hourInTheYear]
+= thermal[area->index].thermalClustersProductions[cluster->areaWideIndex];

pminOfTheClusterForYear[numSpace][(cluster->areaWideIndex * HOURS_PER_YEAR)
+ state.hourInTheYear]
pminOfTheClusterForYear[numSpace]
[(cluster->areaWideIndex * HOURS_PER_YEAR) + state.hourInTheYear]
= thermal[area->index].PMinOfClusters[cluster->areaWideIndex];
}

Expand Down
12 changes: 6 additions & 6 deletions src/solver/variable/include/antares/solver/variable/storage/average.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ struct Average: public NextT
{
case Category::hourly:
InternalExportValues<HOURS_PER_YEAR, VCardT, Category::hourly>(report,
Memory::RawPointer(
avgdata.hourly));
Memory::RawPointer(
avgdata.hourly));
break;
case Category::daily:
InternalExportValues<DAYS_PER_YEAR, VCardT, Category::daily>(report,
avgdata.daily);
InternalExportValues<DAYS_PER_YEAR, VCardT, Category::daily>(report, avgdata.daily);
break;
case Category::weekly:
InternalExportValues<WEEKS_PER_YEAR, VCardT, Category::weekly>(report,
avgdata.weekly);
avgdata.weekly);
break;
case Category::monthly:
InternalExportValues<MONTHS_PER_YEAR, VCardT, Category::monthly>(report, avgdata.monthly);
InternalExportValues<MONTHS_PER_YEAR, VCardT, Category::monthly>(report,
avgdata.monthly);
break;
case Category::annual:
InternalExportValues<1, VCardT, Category::annual>(report, avgdata.year);
Expand Down
22 changes: 12 additions & 10 deletions src/solver/variable/include/antares/solver/variable/storage/minmax.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,24 @@ struct MinMaxBase: public NextT
{
case Category::hourly:
InternalExportIndices<HOURS_PER_YEAR, VCardT>(report,
Memory::RawPointer(
minmax.hourly.data()),
fileLevel);
Memory::RawPointer(
minmax.hourly.data()),
fileLevel);
break;
case Category::daily:
InternalExportIndices<DAYS_PER_YEAR, VCardT>(report,
minmax.daily.data(),
fileLevel);
minmax.daily.data(),
fileLevel);
break;
case Category::weekly:
InternalExportIndices<WEEKS_PER_YEAR, VCardT>(report,
minmax.weekly.data(),
fileLevel);
minmax.weekly.data(),
fileLevel);
break;
case Category::monthly:
InternalExportIndices<MONTHS_PER_YEAR, VCardT>(report, minmax.monthly.data(), fileLevel);
InternalExportIndices<MONTHS_PER_YEAR, VCardT>(report,
minmax.monthly.data(),
fileLevel);
break;
case Category::annual:
InternalExportIndices<1, VCardT>(report, minmax.annual.data(), fileLevel);
Expand All @@ -112,8 +114,8 @@ struct MinMaxBase: public NextT
{
case Category::hourly:
InternalExportValues<HOURS_PER_YEAR, VCardT>(report,
Memory::RawPointer(
minmax.hourly.data()));
Memory::RawPointer(
minmax.hourly.data()));
break;
case Category::daily:
InternalExportValues<DAYS_PER_YEAR, VCardT>(report, minmax.daily.data());
Expand Down
8 changes: 4 additions & 4 deletions src/solver/variable/include/antares/solver/variable/storage/raw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ struct Raw: public NextT
::Antares::Memory::RawPointer(rawdata.hourly));
break;
case Category::daily:
InternalExportValues<Category::daily, DAYS_PER_YEAR, VCardT>(report,
rawdata.daily);
InternalExportValues<Category::daily, DAYS_PER_YEAR, VCardT>(report, rawdata.daily);
break;
case Category::weekly:
InternalExportValues<Category::weekly, WEEKS_PER_YEAR, VCardT>(report,
rawdata.weekly);
rawdata.weekly);
break;
case Category::monthly:
InternalExportValues<Category::monthly, MONTHS_PER_YEAR, VCardT>(report, rawdata.monthly);
InternalExportValues<Category::monthly, MONTHS_PER_YEAR, VCardT>(report,
rawdata.monthly);
break;
case Category::annual:
InternalExportValues<Category::annual, 1, VCardT>(report, rawdata.year);
Expand Down
11 changes: 6 additions & 5 deletions src/solver/variable/include/antares/solver/variable/storage/stdDeviation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ struct StdDeviation: public NextT
break;
case Category::daily:
InternalExportValues<S, DAYS_PER_YEAR, VCardT, Category::daily>(report,
results,
stdDeviationDaily);
results,
stdDeviationDaily);
break;
case Category::weekly:
InternalExportValues<S, WEEKS_PER_YEAR, VCardT, Category::weekly>(
Expand All @@ -159,9 +159,10 @@ struct StdDeviation: public NextT
stdDeviationWeekly);
break;
case Category::monthly:
InternalExportValues<S, MONTHS_PER_YEAR, VCardT, Category::monthly>(report,
results,
stdDeviationMonthly);
InternalExportValues<S, MONTHS_PER_YEAR, VCardT, Category::monthly>(
report,
results,
stdDeviationMonthly);
break;
case Category::annual:
InternalExportValues<S, 1, VCardT, Category::annual>(report,
Expand Down
3 changes: 1 addition & 2 deletions src/solver/variable/state.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,7 @@ void State::yearEndBuildThermalClusterCalculateStartupCosts(
}
}

std::array<uint, HOURS_PER_YEAR>
State::computeEconomicallyOptimalNbClustersONforEachHour(
std::array<uint, HOURS_PER_YEAR> State::computeEconomicallyOptimalNbClustersONforEachHour(
const uint& maxDurationON,
const std::array<uint, HOURS_PER_YEAR>& ON_min,
const std::array<uint, HOURS_PER_YEAR>& ON_max) const
Expand Down
2 changes: 1 addition & 1 deletion src/solver/variable/surveyresults/surveyresults.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <yuni/yuni.h>

#include <antares/logs/logs.h>
#include <antares/solver/variable/print.h>
#include <antares/study/study.h>
#include <antares/utils/utils.h>
#include <antares/solver/variable/print.h>

using namespace Yuni;
using namespace Antares;
Expand Down

0 comments on commit 4728afd

Please sign in to comment.