-
Notifications
You must be signed in to change notification settings - Fork 47
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
Profile: improve profiling code #1447
Open
Doresic
wants to merge
37
commits into
develop
Choose a base branch
from
change_profiling
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
f05dce9
Initial working update
Doresic a465b62
Add TODOs
Doresic 2b02b9a
Introduce adaptive max and min steps
Doresic 275c890
Fix flags for exiting the "trust area"
Doresic e2480bc
Bugfixes, Robustness, Logging, Better plotting
Doresic 8ce9890
Merge branch 'develop' into change_profiling
Doresic ee0aea9
Fix default value for color_path
Doresic 75f3964
Fix color value issues -- failing tests
Doresic 5c911de
Add tuple to isinstance list
Doresic 3cf940b
No color_path plotting if color requested
Doresic a500750
Fix if statements fixed_method
Doresic 6914d19
We're making more steps then before
Doresic 9093474
Change default magic and max values
Doresic 7c77a1b
Change default method, remove TODOs
Doresic f61e61e
Merge branch 'develop' into change_profiling
Doresic c8000d2
Update quality colors
Doresic 08b7e2e
Fix failing test
Doresic 5e06be9
Fix test and docstring
Doresic 6525578
Merge branch 'develop' into change_profiling
Doresic eeb304d
Rewrite some too long if statements
Doresic c65b199
Merge branch 'change_profiling' of https://github.com/ICB-DCM/pyPESTO…
Doresic beee8d9
Some more if statements cleanup
Doresic 1d80988
Change color if no
Doresic 440319b
Merge branch 'develop' into change_profiling
Doresic 814f552
Merge branch 'develop' into change_profiling
Doresic 7627288
Correct y-axis in obj.fun plotting
Doresic 5e86392
Merge branch 'develop' into change_profiling
PaulJonasJost 3c8ccd5
Paul review changes
Doresic c7697e9
More Paul review changes
Doresic 7d8b50c
Merge branch 'develop' into change_profiling
PaulJonasJost 9d74b84
Fix if-while infinite loop bug
Doresic 93250b9
Merge branch 'develop' into change_profiling
Doresic 41411f3
Correct comment variable name
Doresic 649c53c
Change i_color to color_i
Doresic abae4e8
Change docstring of color in lowlevel
Doresic 8ef3b51
Expand colors docstring
Doresic 39a2948
Merge branch 'develop' into change_profiling
Doresic 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
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.
The magic factor now should be larger than 1 rather than between 0 and 1. The next_obj_target now depends on the objective function value difference of the last two profile points, rather than the difference of the last profile point to the global minimum. The former is in general much smaller than the latter, so we want to increase it rather than decrease it using a factor.
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.
Is there a better name for this? magic_factor sounds fun but is rather uninformative. Also: if it stays like that, documentation in line 35-37 needs to be adjusted.
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.
True...
It is kinda the scaling factor of the adaptive target value.
Changed to
adaptive_target_scaling_factor
.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.
Take a look at the documentation of it in ProfileOptions. Not sure if informative enough.