Repository navigation
refactor: Clarify state data, input data, and resolvable data - #2612
Merged
Merged
Conversation
trisyoungs
marked this pull request as ready for review
October 6, 2026 08:41
trisyoungs
requested review from
RobBuchananCompPhys and
rprospero
and removed request for
rprospero
October 6, 2026 08:41
rprospero
approved these changes
Oct 6, 2026
rprospero
left a comment
Contributor
There was a problem hiding this comment.
One question about tests, but everything else looks good
Comment on lines
+74
to
+76
| add_subdirectory(classes) | ||
| add_subdirectory(ff) | ||
| if(GUI) | ||
| add_subdirectory(gui) | ||
| endif(GUI) | ||
| # if(GUI) add_subdirectory(gui) endif(GUI) |
Contributor
There was a problem hiding this comment.
Is there a reason that we're disabling the GUI tests?
Member
Author
There was a problem hiding this comment.
Good question. I believe it was because they were mostly based on old code / models and were now not working or irrelevant, or there was a breaking change caused by something else in flux at the time this PR was written. Looking at the most recent version in Rob's QML Part 4 they are enabled (even though there are very few left in the CMakeLists.txt) so I will revert this change here.
| SerialisedValue Node::serialiseState() const | ||
| { | ||
| SerialisedValue result; | ||
| timing_.serialise("timing", result); |
Contributor
There was a problem hiding this comment.
I'm glad that this is going into the state instead of the input file.
…teData(), remove any serialised data from ForcefieldNode for the time being.
trisyoungs
force-pushed
the
dissolve2/data-serialisation-and-resolving
branch
from
October 6, 2026 15:27
d0a32c3 to
82456e7
Compare
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.
Some observations about node data as it stood:
The term "Serialisable" means ANYTHING...
...but they get stored in different places:
One particular point to note here is that data handled by
serialiseInternal()gets written to the TOML input file, however in general I think that this internal data largely reflects calculated or produced data, and therefore it should sit with the state data.Resolvable data...
...can exist in several places:
However, data resolution is only built into data marked as serialisable with
addSerialisable()which envelops it within aSerialisableClassand which has the requiredresolve()function. Resolvable options currently have no equivalent functionality.Aims of this PR
addSerialisable()toaddStateData().serialiseInternal()andinnerSaveRestart()Nodefunctions and pushing everything throughaddStateData().Parameter::resolve()in order to seamlessly handle resolution of options where necessary.deserialise()at theDissolveGraphlevel has completed.Closes #2524
Closes #2373