Repository navigation
Conversation
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Conflicting parents across encapsulation groups silently overwrite earlier relationships without reporting an error.
2 open findings
What changed in this PR
Updates CellML 1.0/1.1 parsing to support multiple encapsulation groups, addressing #1503.
Changes:
- Loads all encapsulation groups while retaining the CellML 2.0 multiple-encapsulation error.
- Adjusts connection duplicate detection.
- Adds regression tests and model fixtures.
| File | Description |
|---|---|
| tests/resources/cellml1X/multiple_encapsulations.cellml | Adds a two-group encapsulation fixture. |
| tests/resources/cellml1X/map_components.cellml | Adds reversed component mappings. |
| tests/resources/cellml1X/connections.cellml | Adds bidirectional variable mappings. |
| tests/parser/parser.cpp | Updates expected encapsulation diagnostics. |
| tests/parser/cellml_1_1.cpp | Tests multiple legacy encapsulation groups. |
| tests/connection/connection.cpp | Tests connection mapping behavior. |
| src/parser.cpp | Processes all groups and adjusts duplicate detection. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+593
to
+594
| for (const auto &encapsulationNode : encapsulationNodes) { | ||
| loadEncapsulation(model, encapsulationNode); |
Comment on lines
+156
to
+157
| EXPECT_EQ_ISSUES(expectedIssues, parser); | ||
| EXPECT_EQ("Example_MassAction", model->name()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This work fixes #1503 (the handling of parsing encapsulations).
Now, multiple encapsulations are supported when parsing CellML 1.0/1.1 models.