Modeler > Port field definition : allow non linear expressions [ANT-4646] by guilpier-code · Pull Request #3483 · AntaresSimulatorTeam/Antares_Simulator

guilpier-code · 2026-03-12T13:27:03Z

Ticket ANT-4646 is addressed (hopefully) : we relaxed the prohibition in expression of models' port-field-definitions (any non-linear operator is allowed), and we made sure that, once components and connections are read, port field resolution in binding constraint section leads to linear expressions only.

While addressing ANT-4646, what was done (more precisely) :

code about forbidden node was moved in a independent target forbidden-nodes so that it can easily be accessible from both convert model (model creation) and convert system (components creation and connections). In this context, source files about forbidden nodes were moved to another location.
Class ForbiddenNodesVisitor was modified to be able to make port field resolution and check linearity.
we need to modify class SystemModel::Constraint in order to be able to distinguish simple constraints and binding constraints
determination of port field role (sender or receiver) was moved from system conversion into model conversion (thus, earlier) : we don't have to wait until system conversion in order to find out these roles.
Tests :
- study (full modeler) for cucumber, to check that defining a thermal cluster income works
- Unit tests to check that prohibition works
updating documentation

guilpier-code · 2026-03-12T13:33:24Z

@@ -87,58 +87,43 @@ static void CommonPreSolve(ForbiddenNodes& f)

 static ForbiddenNodes ForbiddenInConstraint()


Code about defining node prohibition in an expression (depending on use context) was simplified.

What remains : static functions are still called once.

What we loose : calls to these functions are eager (they are called once exactly, even if not needed). Code used to be lazy (calls were made once, and only if needed).

What we gain : code is more readable, more simple, has less lines

…+ change node prohibition for port field definition

…es compatibility of 2 connected port fields

…dels

flomnes

The logic for port field role is unclear

flomnes · 2026-03-16T13:41:07Z

+const ForbiddenNodes forbiddenInConstraint = ForbidNodesInConstraint();
+const ForbiddenNodes forbiddenInBindingConstraint = ForbidNodesInBindingConstraint();
+const ForbiddenNodes forbiddenInVariableBounds = ForbidNodesInVariableBounds();
+const ForbiddenNodes forbiddenInPortFieldDef = ForbidNodesInPortFieldDef();
+const ForbiddenNodes forbiddenInObjective = ForbidNodesInObjective();
+const ForbiddenNodes forbiddenInExtraOutput = ForbidNodesInExtraOutput();


I'm not sure why this needs to be added

I did that for performance reason : otherwise we would have to call the same function each time we need it.
Here the result of this call is store in a constant.

…efore allowing forbidden nodes in system conversion)

…ired other work

…o ForbiddenNodes.h/.cpp

…ired other work

…indingConstraint_ to class SystemModel::Constraint

…converting system

…lax-expr-in-port-definition # Conflicts: # src/io/inputs/model-converter/modelConverter.cpp # src/study/system-model/include/antares/study/system-model/constraint.h

flomnes

Lots of refactoring / renaming, can you split this PR in 2 ?

Refactor / rename
Implement the actual feature

Thank you

…t not yet run by cucumber.

…ng an expected exception

guilpier-code · 2026-03-19T16:27:21Z

The logic for port field role is unclear

what do you mean by unclear ? unclear in what way ?

Co-authored-by: guilpier-code <62292552+guilpier-code@users.noreply.github.com> Co-authored-by: guilpierre <guillaume.pierre_externe@rte-france.com> Co-authored-by: Jason Maréchal <45510813+JasonMarechal25@users.noreply.github.com> Co-authored-by: Josh <139483907+YoshuaLisasi@users.noreply.github.com>

pull-request-size · 2026-03-24T10:48:28Z

This PR is too big. Please break it up into smaller PRs.

sonarqubecloud · 2026-03-24T11:50:16Z

Quality Gate passed

Issues
6 New issues
0 Accepted issues

Measures
0 Security Hotspots
72.7% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@Juliette-Gerbaux

…3536) This PR is about [ticket ANT-4646](https://gopro-tickets.rte-france.com/browse/ANT-4646). A first PR ([PR 3483](#3483)) was merged into **develop**. After tests by @Juliette-Gerbaux, some fixes were recommended : - relax port field definitions expressions, so that non linear operators **min**, **max**, **ceil**, **floor** can accept variable nodes (**VariableNode**). - restore prohibition of operator **sum_connections** (node **PortFieldSumNode**) in port field definitions --------- Co-authored-by: guilpierre <guillaume.pierre_externe@rte-france.com>

Relax expressions in port definition : make code more clear

2ae3399

pull-request-size bot added the size/M label Mar 12, 2026

guilpier-code commented Mar 12, 2026

View reviewed changes

Relax expressions in port definition : specializing node prohibition …

3e2ddeb

…+ change node prohibition for port field definition

pull-request-size bot added size/L and removed size/M labels Mar 12, 2026

guilpierre added 4 commits March 12, 2026 18:37

Relax expressions in port definition : simplification on checking rol…

06b8e8a

…es compatibility of 2 connected port fields

Relax expressions in port definition : renaming makes code shorter

625339f

Relax expressions in port definition : small simplification

f6d5df7

Relax expressions in port definition : set field role when reading mo…

ff91b10

…dels

flomnes reviewed Mar 16, 2026

View reviewed changes

guilpierre added 2 commits March 16, 2026 16:29

Relax expressions in port definition : just saving unfinished work (b…

fd12a77

…efore allowing forbidden nodes in system conversion)

Relax expressions in port definition : extract a forbidden-nodes target

3d3c4af

flomnes changed the title ~~Modeler > Port field definition : allow non linear expressions~~ Modeler > Port field definition : allow non linear expressions [ANT-4646] Mar 17, 2026

guilpierre added 3 commits March 17, 2026 11:36

Relax expressions in port definition : save a bot of work before requ…

368a30f

…ired other work

Relax expressions in port definition : moving forbidden nodes lists t…

cdcd5c1

…o ForbiddenNodes.h/.cpp

Relax expressions in port definition : save a bot of work before requ…

4f80360

…ired other work

pull-request-size bot added size/XL and removed size/L labels Mar 18, 2026

guilpierre added 2 commits March 18, 2026 13:54

Relax expressions in port definition : mainly adding an attribute isB…

a8e9ef6

…indingConstraint_ to class SystemModel::Constraint

Relax expressions in port definition : mainly a fix

f5f37fa

guilpier-code requested review from flomnes and tbittar March 18, 2026 15:52

guilpierre added 2 commits March 18, 2026 17:27

Relax expressions in port definition : uncomment check function when …

d239fb3

…converting system

Merge remote-tracking branch 'remotes/origin/develop' into feature/re…

b66244c

…lax-expr-in-port-definition # Conflicts: # src/io/inputs/model-converter/modelConverter.cpp # src/study/system-model/include/antares/study/system-model/constraint.h

flomnes reviewed Mar 18, 2026

View reviewed changes

guilpierre added 3 commits March 19, 2026 14:55

Relax expressions in port definition : adding a test for cucumber, bu…

76fa37a

…t not yet run by cucumber.

Relax expressions in port definition : add / fix comments

0197293

Relax expressions in port definition : adding a unit test on a throwi…

0ee40de

…ng an expected exception

Relax expressions in port definition : adding a cucumber test

690c7f1

guilpier-code marked this pull request as ready for review March 19, 2026 17:16

guilpier-code requested review from JasonMarechal25, flomnes and payetvin March 19, 2026 17:16

guilpierre added 2 commits March 20, 2026 14:36

Relax expressions in port definition : complete cucumber test

759e59b

[skip ci] Relax expressions in port definition : adding documentation

b5d878f

flomnes reviewed Mar 23, 2026

View reviewed changes

Comment thread src/io/inputs/model-converter/modelConverter.cpp Outdated

Comment thread src/io/inputs/forbidden-nodes/ForbiddenNodesVisitor.cpp Outdated

Comment thread src/io/inputs/forbidden-nodes/ForbiddenNodesVisitor.cpp Outdated

guilpierre and others added 2 commits March 24, 2026 11:11

Relax expressions in port definition : fix due to review

adfc8d6

pull-request-size bot added size/XXL and removed size/XL labels Mar 24, 2026

Merge branch 'develop' into feature/relax-expr-in-port-definition

ee683ea

pull-request-size bot added size/XL and removed size/XXL labels Mar 24, 2026

flomnes approved these changes Mar 24, 2026

View reviewed changes

flomnes merged commit 2694c8b into develop Mar 24, 2026
10 checks passed

flomnes deleted the feature/relax-expr-in-port-definition branch March 24, 2026 11:53

guilpier-code mentioned this pull request Apr 2, 2026

Relax expressions in port definition : fixes after tests [ANT-4646] #3536

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modeler > Port field definition : allow non linear expressions [ANT-4646]#3483

Modeler > Port field definition : allow non linear expressions [ANT-4646]#3483
flomnes merged 24 commits intodevelopfrom
feature/relax-expr-in-port-definition

guilpier-code commented Mar 12, 2026 •

edited

Loading

Uh oh!

guilpier-code Mar 12, 2026 •

edited

Loading

Uh oh!

flomnes left a comment

Uh oh!

flomnes Mar 16, 2026

Uh oh!

guilpier-code Mar 23, 2026

Uh oh!

Uh oh!

flomnes left a comment

Uh oh!

guilpier-code commented Mar 19, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pull-request-size bot commented Mar 24, 2026

Uh oh!

sonarqubecloud bot commented Mar 24, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -87,58 +87,43 @@ static void CommonPreSolve(ForbiddenNodes& f)

		static ForbiddenNodes ForbiddenInConstraint()

Conversation

guilpier-code commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

guilpier-code Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

flomnes left a comment

Choose a reason for hiding this comment

Uh oh!

flomnes Mar 16, 2026

Choose a reason for hiding this comment

Uh oh!

guilpier-code Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

flomnes left a comment

Choose a reason for hiding this comment

Uh oh!

guilpier-code commented Mar 19, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pull-request-size bot commented Mar 24, 2026

Uh oh!

sonarqubecloud bot commented Mar 24, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

guilpier-code commented Mar 12, 2026 •

edited

Loading

guilpier-code Mar 12, 2026 •

edited

Loading