Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix recently introduced build warnings #2569

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix recently introduced build warnings #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56df234
Fix recently introduced build warnings
flomnes Jan 10, 2025
c55656b
Fix
flomnes Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/solver/optimisation/opt_optimisation_lineaire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void OPT_WriteSolution(const PROBLEME_ANTARES_A_RESOUDRE& pb,
buffer.clear();

filename = createMarginalCostFilename(optPeriodStringGenerator, optimizationNumber);
for (unsigned int cont = 0; cont < pb.NombreDeContraintes; ++cont)
for (int cont = 0; cont < pb.NombreDeContraintes; ++cont)
{
buffer.appendFormat("%s\t%11.10e\n",
pb.NomDesContraintes[cont].c_str(),
Expand All @@ -87,7 +87,7 @@ void OPT_WriteSolution(const PROBLEME_ANTARES_A_RESOUDRE& pb,
buffer.clear();

filename = createReducedCostFilename(optPeriodStringGenerator, optimizationNumber);
for (unsigned int var = 0; var < pb.NombreDeVariables; ++var)
for (int var = 0; var < pb.NombreDeVariables; ++var)
{
buffer.appendFormat("%s\t%11.10e\n", pb.NomDesVariables[var].c_str(), pb.CoutsReduits[var]);
}
Expand Down
47 changes: 23 additions & 24 deletions src/solver/variable/include/antares/solver/variable/economy/priceCSR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,29 @@ struct VCardPriceCSR
//! The VCard to look for for calculating spatial aggregates
typedef VCardPrice VCardForSpatialAggregate;

enum
{
//! Data Level
categoryDataLevel = Category::DataLevel::area,
//! File level (provided by the type of the results)
categoryFileLevel = ResultsType::categoryFile
& (Category::FileLevel::id | Category::FileLevel::va),
//! Precision (views)
precision = Category::all,
//! Indentation (GUI)
nodeDepthForGUI = +0,
//! Decimal precision
decimal = 2,
//! Number of columns used by the variable (One ResultsType per column)
columnCount = 1,
//! The Spatial aggregation
spatialAggregate = Category::spatialAggregateAverage,
spatialAggregateMode = Category::spatialAggregateEachYear,
spatialAggregatePostProcessing = Category::spatialAggregatePostProcessingPrice,
//! Intermediate values
hasIntermediateValues = 1,
//! Can this variable be non applicable (0 : no, 1 : yes)
isPossiblyNonApplicable = 0,
};
//! Data Level
static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
//! File level (provided by the type of the results)
static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
& (Category::FileLevel::id
| Category::FileLevel::va);
//! Precision (views)
static constexpr uint8_t precision = Category::all;
//! Indentation (GUI)
static constexpr uint8_t nodeDepthForGUI = +0;
//! Decimal precision
static constexpr uint8_t decimal = 2;
//! Number of columns used by the variable (One ResultsType per column)
static constexpr int columnCount = 1;
//! The Spatial aggregation
static constexpr uint8_t spatialAggregate = Category::spatialAggregateAverage;
static constexpr uint8_t spatialAggregateMode = Category::spatialAggregateEachYear;
static constexpr uint8_t spatialAggregatePostProcessing = Category::
spatialAggregatePostProcessingPrice;
//! Intermediate values
static constexpr uint8_t hasIntermediateValues = 1;
//! Can this variable be non applicable (0 : no, 1 : yes)
static constexpr uint8_t isPossiblyNonApplicable = 0;

typedef IntermediateValues IntermediateValuesBaseType;
typedef IntermediateValues* IntermediateValuesType;
Expand Down
2 changes: 1 addition & 1 deletion src/tests/src/solver/optim-model-filler/test_componentFiller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void LinearProblemBuildingFixture::createModel(string modelId,
{
Antares::Solver::NodeRegistry node_registry(node, move(nodes));
Expression expression("expression", move(node_registry));
return move(expression);
return expression;
};
vector<Parameter> parameters;
for (auto parameter_id: parameterIds)
Expand Down
Loading