Skip to content

Commit

Permalink
format code
Browse files Browse the repository at this point in the history
  • Loading branch information
pet-mit committed Feb 14, 2025
1 parent 83a24e9 commit 1453583
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 22 deletions.
6 changes: 2 additions & 4 deletions src/solver/application/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ namespace
{
void printSolvers()
{
std::cout << "Available linear solvers: "
<< availableLinearSolversString() << std::endl;
std::cout << "Available quadratic solvers: "
<< availableQuadraticSolversString() << std::endl;
std::cout << "Available linear solvers: " << availableLinearSolversString() << std::endl;
std::cout << "Available quadratic solvers: " << availableQuadraticSolversString() << std::endl;
}
} // namespace

Expand Down
6 changes: 2 additions & 4 deletions src/solver/misc/options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,8 @@ void checkSolverExists(std::string solverName, const std::list<std::string> avai

void checkForSolversExistence(Solver::Optimization::OptimizationOptions& solverOptions)
{
checkSolverExists(solverOptions.linearSolver,
getAvailableLinearSolverNames());
checkSolverExists(solverOptions.quadraticSolver,
getAvailableQuadraticSolverNames());
checkSolverExists(solverOptions.linearSolver, getAvailableLinearSolverNames());
checkSolverExists(solverOptions.quadraticSolver, getAvailableQuadraticSolverNames());
}

void Settings::checkAndSetStudyFolder(const std::string& folder)
Expand Down
5 changes: 3 additions & 2 deletions src/solver/simulation/base_post_process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ std::unique_ptr<interfacePostProcessList> interfacePostProcessList::create(
SheddingPolicy sheddingPolicy,
SimplexOptimization splxOptimization,
Calendar& calendar,
const OptimizationOptions& solverOptions)
const OptimizationOptions& solverOptions)
{
if (adqPatchParams.enabled)
{
Expand All @@ -58,7 +58,8 @@ std::unique_ptr<interfacePostProcessList> interfacePostProcessList::create(
areas,
sheddingPolicy,
splxOptimization,
calendar, solverOptions);
calendar,
solverOptions);
}
else
{
Expand Down
4 changes: 1 addition & 3 deletions src/solver/simulation/economy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,7 @@ bool Economy::year(Progression::Task& progression,
weeklyOptProblems_[numSpace].solve();

// Runs all the post processes in the list of post-process commands
optRuntimeData opt_runtime_data(state.year,
w,
hourInTheYear);
optRuntimeData opt_runtime_data(state.year, w, hourInTheYear);
postProcessesList_[numSpace]->runAll(opt_runtime_data);

variables.weekBegin(state);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,15 @@ class interfacePostProcessList
// gp : to the create(...) method, and to underlying calls to constructors.
// gp : In case we need new data for a new post process, we would not have to change
// gp : the constructors' signatures of the post process list classes.
static std::unique_ptr<interfacePostProcessList> create(AdqPatchParams& adqPatchParams,
PROBLEME_HEBDO* problemeHebdo,
uint numSpace,
AreaList& areas,
SheddingPolicy sheddingPolicy,
SimplexOptimization splxOptimization,
Calendar& calendar,
const OptimizationOptions& solverOptions);
static std::unique_ptr<interfacePostProcessList> create(
AdqPatchParams& adqPatchParams,
PROBLEME_HEBDO* problemeHebdo,
uint numSpace,
AreaList& areas,
SheddingPolicy sheddingPolicy,
SimplexOptimization splxOptimization,
Calendar& calendar,
const OptimizationOptions& solverOptions);
void runAll(const optRuntimeData& opt_runtime_data);

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ std::list<std::string> getAvailableLinearSolverNames();
*/
std::string availableLinearSolversString();


/*!
* \brief Returns a list of available ortools quadratic solver names on our side
*
Expand Down

0 comments on commit 1453583

Please sign in to comment.