Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Convergence tracking #193

Merged
merged 15 commits into from
Oct 19, 2022
Merged

Convergence tracking #193

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
38d0d05
improved convergence tracking
quaquel Sep 28, 2022
ef5d255
ongoing work
quaquel Sep 28, 2022
651a28b
ArchiveLogger now uses a tarbal
quaquel Sep 28, 2022
375896f
shift to using a directory before creating the tarbal
quaquel Oct 4, 2022
1c824f7
additional convergence metrics
quaquel Oct 6, 2022
65f8637
further cleaning if init
quaquel Oct 12, 2022
82f61b2
Update optimization.py
quaquel Oct 12, 2022
b7f70cc
Update optimization.py
quaquel Oct 12, 2022
9283063
Update optimization.py
quaquel Oct 12, 2022
bfc7657
Update optimization.py
quaquel Oct 19, 2022
9140859
Update ema_workbench/examples/lake_model_dps.py
quaquel Oct 19, 2022
ce89705
Update ema_workbench/em_framework/optimization.py
quaquel Oct 19, 2022
93fb61e
Add parentheses to fix assignment expression syntax
EwoutH Oct 19, 2022
54652e3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 19, 2022
5f8274d
optimization.py: Fix empty lines in docstring
EwoutH Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/indepth_tutorial/directed-search.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.7"
"version": "3.9.12"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
Expand Down
30 changes: 25 additions & 5 deletions ema_workbench/em_framework/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,20 @@
"MultiprocessingEvaluator",
"SequentialEvaluator",
"ReplicatorModel",
"EpsilonProgress",
"HyperVolume",
"Convergence",
"ArchiveLogger",
"ArrayOutcome",
"Samplers",
"OutputSpaceExploration",
"EpsilonProgress",
"ArchiveLogger",
"HypervolumeMetric",
"GenerationalDistanceMetric",
"SpacingMetric",
"InvertedGenerationalDistanceMetric",
"EpsilonIndicatorMetric",
"epsilon_nondominated",
"rebuild_platypus_population",
"to_problem",
"to_robust_problem",
]

from .outcomes import ScalarOutcome, TimeSeriesOutcome, Constraint, ArrayOutcome
Expand Down Expand Up @@ -73,7 +80,20 @@
SequentialEvaluator,
Samplers,
)
from .optimization import Convergence, HyperVolume, EpsilonProgress, ArchiveLogger
from .optimization import (
Convergence,
EpsilonProgress,
ArchiveLogger,
HypervolumeMetric,
EpsilonIndicatorMetric,
GenerationalDistanceMetric,
InvertedGenerationalDistanceMetric,
SpacingMetric,
epsilon_nondominated,
rebuild_platypus_population,
to_problem,
to_robust_problem,
)
from .outputspace_exploration import OutputSpaceExploration

try:
Expand Down
Loading