-
Notifications
You must be signed in to change notification settings - Fork 41
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.
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
Handling of constraints for polydisperse parameters (fix #1588) #2348
Merged
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
2a2fabe
Initial commit. Not yet functional.
rozyczko c88153e
Use Qt.UserRole to store actual polydisp param name.
rozyczko bd200d2
More changes and fixes for mutual constraints, deleting and editing.
rozyczko 40f827a
Show status bar info about the polydisp. constraint.
rozyczko b8843ef
Merge branch 'ESS_GUI' into ESS_GUI_constrain_poly
rozyczko 7b9a446
Generalized constraint removal for certain cases, fixed complex
rozyczko 4bc1fdd
Remove potential empty tabs on project load
rozyczko 6f1c433
Minor stability fixes
rozyczko e0fd41b
Merge remote-tracking branch 'origin/main' into ESS_GUI_constrain_poly
rozyczko 17c2ed7
Added proper filling of the first parameter list.
rozyczko 2ffef79
don't update non-existing GUI elements
rozyczko 754fc29
polydisperse parameters now appear as options for m2
Caddy-Jones f2cd591
Model encoded as a dictionary
Caddy-Jones 1b67e06
Streamlined how model_key is determined, and fixed an issue when cons…
Caddy-Jones 3c5e9f9
Fix TypeError when constraining two polidysperse parameters
Caddy-Jones aadaf70
Fixed the issue with adding multiple constraints
Caddy-Jones 8cbe68f
Check for model is None
lucas-wilkins 470f4d9
comment on a comment
lucas-wilkins 24e4f51
Merge branch 'main' into ESS_GUI_constrain_poly
lucas-wilkins 43a0c83
Merge branch 'main' into ESS_GUI_constrain_poly
gonzalezma 0444df7
debugging
gonzalezma ad5b96d
Merge branch 'main' into ESS_GUI_constrain_poly
gonzalezma 0cb37a9
Merge branch 'main' into ESS_GUI_constrain_poly
gonzalezma d391c2c
Pushing after 1st successful test and before starting cleaning
gonzalezma 76eeeea
Fix failure arising when a second polydispersity constraint is added
gonzalezma 97f1115
Make poly constraints removable, remove unnecessary name checks, and …
gonzalezma e419cf7
Make All button to work also for PD constraints
gonzalezma c6e3181
Merge branch 'main' into ESS_GUI_constrain_poly
gonzalezma 72ae012
Try to improve handling of uncertainties when parameters are constrai…
gonzalezma 73da363
Get back to previous version of BumpsFit, but fixing evaluation order…
gonzalezma 2c1fc37
Fix tests for chained dependencies
d1c1ffb
Remove unnecessary code
gonzalezma 5c8012d
Show all parameters, including constrained ones, in RHS of the Comple…
gonzalezma 1d8fea2
More code simplification
gonzalezma 6278f5b
Remove unneeded try/except block
gonzalezma c6732b9
Suggested code simplification
gonzalezma 51c83de
Add warning for user if parameter error cannot be computed
gonzalezma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't need a property to access an attribute as an attribute. Just rename
_model
tomodel
.The reason you might want to convert an attribute to a property is if you want filter the value on get/set. For example,
My convention is to only use properties if the amount of work is small, otherwise use a method. Imagine that you are accessing the property value in a loop. If caching the value before the loop provides a significant speedup then you should not be using a property.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comes from the original design by @rozyczko, so I let him decide on this (my coding expertise is not enough to judge between the merits of each approach!).