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

Simplify ComponentFiller::addVariables #2615

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Simplify ComponentFiller::addVariables #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 15 additions & 23 deletions src/solver/optim-model-filler/ComponentFiller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,45 +44,37 @@ bool checkTimeSteps(Solver::Modeler::Api::FillContext& ctx)
return ctx.getFirstTimeStep() <= ctx.getLastTimeStep();
}

void ComponentFiller::addVariables_(Solver::Modeler::Api::ILinearProblem& pb,
const std::unique_ptr<Solver::Visitors::EvalVisitor>& evaluator,
unsigned int nb_vars) const
void ComponentFiller::addVariables(Solver::Modeler::Api::ILinearProblem& pb,
Solver::Modeler::Api::LinearProblemData& data,
Solver::Modeler::Api::FillContext& ctx)
{
if (!checkTimeSteps(ctx))
{
// exception?
return;
}

Solver::Visitors::EvalVisitor evaluator(evaluationContext_);
for (const auto& variable: component_.getModel()->Variables() | std::views::values)
{
if (variable.isTimeDependent())
{
pb.addVariable(evaluator->dispatch(variable.LowerBound().RootNode()),
evaluator->dispatch(variable.UpperBound().RootNode()),
pb.addVariable(evaluator.dispatch(variable.LowerBound().RootNode()),
evaluator.dispatch(variable.UpperBound().RootNode()),
variable.Type() != Study::SystemModel::ValueType::FLOAT,
component_.Id() + "." + variable.Id(),
nb_vars);
ctx.getNumberOfTimestep());
}
else
{
pb.addVariable(evaluator->dispatch(variable.LowerBound().RootNode()),
evaluator->dispatch(variable.UpperBound().RootNode()),
pb.addVariable(evaluator.dispatch(variable.LowerBound().RootNode()),
evaluator.dispatch(variable.UpperBound().RootNode()),
variable.Type() != Study::SystemModel::ValueType::FLOAT,
component_.Id() + "." + variable.Id());
}
}
}

void ComponentFiller::addVariables(Solver::Modeler::Api::ILinearProblem& pb,
Solver::Modeler::Api::LinearProblemData& data,
Solver::Modeler::Api::FillContext& ctx)
{
auto evaluator = std::make_unique<Solver::Visitors::EvalVisitor>(evaluationContext_);
if (checkTimeSteps(ctx))
{
addVariables_(pb, evaluator, ctx.getNumberOfTimestep());
}
else
{
// exception?
}
}

void ComponentFiller::addStaticConstraint(Solver::Modeler::Api::ILinearProblem& pb,
const LinearConstraint& linear_constraint,
const std::string& constraint_id) const
Expand Down
4 changes: 0 additions & 4 deletions src/solver/optim-model-filler/include/antares/solver/optim-model-filler/ComponentFiller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ class ComponentFiller: public Solver::Modeler::Api::LinearProblemFiller
/// Create a ComponentFiller for a Component
explicit ComponentFiller(const Study::SystemModel::Component& component);

void addVariables_(Solver::Modeler::Api::ILinearProblem& pb,
const std::unique_ptr<Solver::Visitors::EvalVisitor>& evaluator,
unsigned int nb_vars) const;

void addVariables(Solver::Modeler::Api::ILinearProblem& pb,
Solver::Modeler::Api::LinearProblemData& data,
Solver::Modeler::Api::FillContext& ctx) override;
Expand Down
Loading