amm-optimizer 0.2.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- amm_optimizer-0.2.0/.gitignore +173 -0
- amm_optimizer-0.2.0/CHANGELOG.md +117 -0
- amm_optimizer-0.2.0/CITATION.cff +15 -0
- amm_optimizer-0.2.0/LICENSE +201 -0
- amm_optimizer-0.2.0/PKG-INFO +406 -0
- amm_optimizer-0.2.0/README.md +175 -0
- amm_optimizer-0.2.0/conftest.py +1 -0
- amm_optimizer-0.2.0/docs/DEVIATIONS.md +44 -0
- amm_optimizer-0.2.0/docs/FREEZE_2026-10-22.md +42 -0
- amm_optimizer-0.2.0/pyproject.toml +76 -0
- amm_optimizer-0.2.0/reference/__init__.py +0 -0
- amm_optimizer-0.2.0/reference/atm_original.py +1749 -0
- amm_optimizer-0.2.0/reference/constants.py +9 -0
- amm_optimizer-0.2.0/src/amm/__init__.py +31 -0
- amm_optimizer-0.2.0/src/atm/__init__.py +19 -0
- amm_optimizer-0.2.0/src/atm/api.py +1603 -0
- amm_optimizer-0.2.0/src/atm/basin_phase.py +271 -0
- amm_optimizer-0.2.0/src/atm/bounds.py +87 -0
- amm_optimizer-0.2.0/src/atm/chain_phase.py +588 -0
- amm_optimizer-0.2.0/src/atm/cma_phase.py +736 -0
- amm_optimizer-0.2.0/src/atm/cobyqa_phase.py +157 -0
- amm_optimizer-0.2.0/src/atm/conductor.py +71 -0
- amm_optimizer-0.2.0/src/atm/config.py +1232 -0
- amm_optimizer-0.2.0/src/atm/control.py +169 -0
- amm_optimizer-0.2.0/src/atm/es_phase.py +707 -0
- amm_optimizer-0.2.0/src/atm/hyperparams.py +75 -0
- amm_optimizer-0.2.0/src/atm/legacy_stream.py +67 -0
- amm_optimizer-0.2.0/src/atm/meta.py +82 -0
- amm_optimizer-0.2.0/src/atm/nm_phase.py +81 -0
- amm_optimizer-0.2.0/src/atm/objective.py +211 -0
- amm_optimizer-0.2.0/src/atm/plan.py +90 -0
- amm_optimizer-0.2.0/src/atm/pop_cma.py +313 -0
- amm_optimizer-0.2.0/src/atm/presets.py +269 -0
- amm_optimizer-0.2.0/src/atm/profiling.py +244 -0
- amm_optimizer-0.2.0/src/atm/py.typed +0 -0
- amm_optimizer-0.2.0/src/atm/qn_phase.py +1678 -0
- amm_optimizer-0.2.0/src/atm/regimes.py +107 -0
- amm_optimizer-0.2.0/src/atm/restart.py +75 -0
- amm_optimizer-0.2.0/src/atm/result.py +19 -0
- amm_optimizer-0.2.0/src/atm/sampler.py +287 -0
- amm_optimizer-0.2.0/src/atm/search.py +172 -0
- amm_optimizer-0.2.0/src/atm/section.py +309 -0
- amm_optimizer-0.2.0/src/atm/simplex.py +223 -0
- amm_optimizer-0.2.0/src/atm/state.py +116 -0
- amm_optimizer-0.2.0/src/atm/step_phase.py +233 -0
- amm_optimizer-0.2.0/src/atm/surrogate.py +315 -0
- amm_optimizer-0.2.0/tests/characterisation.json +80225 -0
- amm_optimizer-0.2.0/tests/characterisation_arms.json +14155 -0
- amm_optimizer-0.2.0/tests/characterisation_cases.py +439 -0
- amm_optimizer-0.2.0/tests/config_defaults.json +193 -0
- amm_optimizer-0.2.0/tests/golden/golden.json +22626 -0
- amm_optimizer-0.2.0/tests/golden/presets.json +137 -0
- amm_optimizer-0.2.0/tests/golden/scenarios.py +121 -0
- amm_optimizer-0.2.0/tests/golden_variants.json +770 -0
- amm_optimizer-0.2.0/tests/preset_cases.py +102 -0
- amm_optimizer-0.2.0/tests/test_analysis.py +205 -0
- amm_optimizer-0.2.0/tests/test_basin_phase.py +278 -0
- amm_optimizer-0.2.0/tests/test_batch12_options.py +291 -0
- amm_optimizer-0.2.0/tests/test_batch5_cma_options.py +162 -0
- amm_optimizer-0.2.0/tests/test_bbob_harness.py +275 -0
- amm_optimizer-0.2.0/tests/test_bounds.py +140 -0
- amm_optimizer-0.2.0/tests/test_budget.py +77 -0
- amm_optimizer-0.2.0/tests/test_chain_phase.py +264 -0
- amm_optimizer-0.2.0/tests/test_characterisation.py +220 -0
- amm_optimizer-0.2.0/tests/test_ci_script.py +166 -0
- amm_optimizer-0.2.0/tests/test_cma_phase.py +214 -0
- amm_optimizer-0.2.0/tests/test_cobyqa_phase.py +96 -0
- amm_optimizer-0.2.0/tests/test_conductor.py +96 -0
- amm_optimizer-0.2.0/tests/test_config_surface.py +330 -0
- amm_optimizer-0.2.0/tests/test_covariance.py +189 -0
- amm_optimizer-0.2.0/tests/test_covariance_repair.py +55 -0
- amm_optimizer-0.2.0/tests/test_determinism.py +118 -0
- amm_optimizer-0.2.0/tests/test_es_phase.py +371 -0
- amm_optimizer-0.2.0/tests/test_f13_options.py +107 -0
- amm_optimizer-0.2.0/tests/test_gaps3_options.py +130 -0
- amm_optimizer-0.2.0/tests/test_gaps4_options.py +188 -0
- amm_optimizer-0.2.0/tests/test_golden_reference.py +46 -0
- amm_optimizer-0.2.0/tests/test_harness_ergonomics.py +145 -0
- amm_optimizer-0.2.0/tests/test_hyperparams.py +57 -0
- amm_optimizer-0.2.0/tests/test_ideas132.py +161 -0
- amm_optimizer-0.2.0/tests/test_improved_preset.py +85 -0
- amm_optimizer-0.2.0/tests/test_improved_v2_preset.py +85 -0
- amm_optimizer-0.2.0/tests/test_initial_design.py +80 -0
- amm_optimizer-0.2.0/tests/test_legacy_stream.py +27 -0
- amm_optimizer-0.2.0/tests/test_mabbob.py +514 -0
- amm_optimizer-0.2.0/tests/test_minimize.py +118 -0
- amm_optimizer-0.2.0/tests/test_mlsl_placement.py +59 -0
- amm_optimizer-0.2.0/tests/test_novel_ideas.py +138 -0
- amm_optimizer-0.2.0/tests/test_parity.py +67 -0
- amm_optimizer-0.2.0/tests/test_parked2_options.py +299 -0
- amm_optimizer-0.2.0/tests/test_phase_units.py +992 -0
- amm_optimizer-0.2.0/tests/test_pool_rule.py +89 -0
- amm_optimizer-0.2.0/tests/test_preset_traces.py +35 -0
- amm_optimizer-0.2.0/tests/test_presets.py +47 -0
- amm_optimizer-0.2.0/tests/test_profiling.py +231 -0
- amm_optimizer-0.2.0/tests/test_quick_scan.py +344 -0
- amm_optimizer-0.2.0/tests/test_quick_scan_year.py +65 -0
- amm_optimizer-0.2.0/tests/test_readme.py +15 -0
- amm_optimizer-0.2.0/tests/test_regimes.py +169 -0
- amm_optimizer-0.2.0/tests/test_restart.py +65 -0
- amm_optimizer-0.2.0/tests/test_rng_ledger.py +133 -0
- amm_optimizer-0.2.0/tests/test_robustness.py +55 -0
- amm_optimizer-0.2.0/tests/test_route_steps.py +634 -0
- amm_optimizer-0.2.0/tests/test_routing.py +315 -0
- amm_optimizer-0.2.0/tests/test_sampler.py +160 -0
- amm_optimizer-0.2.0/tests/test_sampler_options.py +140 -0
- amm_optimizer-0.2.0/tests/test_sampler_variants_audit.py +101 -0
- amm_optimizer-0.2.0/tests/test_scale_learning.py +91 -0
- amm_optimizer-0.2.0/tests/test_second_best.py +72 -0
- amm_optimizer-0.2.0/tests/test_selection.py +91 -0
- amm_optimizer-0.2.0/tests/test_simplex.py +254 -0
- amm_optimizer-0.2.0/tests/test_skip_incumbent.py +108 -0
- amm_optimizer-0.2.0/tests/test_small_switch.py +143 -0
- amm_optimizer-0.2.0/tests/test_stage_extend_cap.py +54 -0
- amm_optimizer-0.2.0/tests/test_stagnation_restart.py +104 -0
- amm_optimizer-0.2.0/tests/test_success_rate.py +201 -0
- amm_optimizer-0.2.0/tests/test_surrogate.py +1568 -0
- amm_optimizer-0.2.0/tests/test_variants.py +151 -0
- amm_optimizer-0.2.0/tests/test_width_units.py +61 -0
- amm_optimizer-0.2.0/tests/variant_cases.py +330 -0
- amm_optimizer-0.2.0/tools/ci.py +286 -0
- amm_optimizer-0.2.0/tools/fetch_mabbob_data.py +220 -0
- amm_optimizer-0.2.0/tools/profile_composite.py +107 -0
- amm_optimizer-0.2.0/tools/record_characterisation.py +173 -0
- amm_optimizer-0.2.0/tools/record_golden.py +49 -0
- amm_optimizer-0.2.0/tools/record_presets.py +39 -0
- amm_optimizer-0.2.0/tools/record_variants.py +49 -0
- amm_optimizer-0.2.0/tools/repair_fopt_cache.py +113 -0
- amm_optimizer-0.2.0/tools/rerun_false_hits.py +96 -0
- amm_optimizer-0.2.0/tools/variant_usage.py +94 -0
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
# Byte-compiled / optimized / DLL files
|
|
2
|
+
__pycache__/
|
|
3
|
+
*.py[cod]
|
|
4
|
+
*$py.class
|
|
5
|
+
|
|
6
|
+
# C extensions
|
|
7
|
+
*.so
|
|
8
|
+
|
|
9
|
+
# Distribution / packaging
|
|
10
|
+
.Python
|
|
11
|
+
build/
|
|
12
|
+
develop-eggs/
|
|
13
|
+
dist/
|
|
14
|
+
downloads/
|
|
15
|
+
eggs/
|
|
16
|
+
.eggs/
|
|
17
|
+
lib/
|
|
18
|
+
lib64/
|
|
19
|
+
parts/
|
|
20
|
+
sdist/
|
|
21
|
+
var/
|
|
22
|
+
wheels/
|
|
23
|
+
share/python-wheels/
|
|
24
|
+
*.egg-info/
|
|
25
|
+
.installed.cfg
|
|
26
|
+
*.egg
|
|
27
|
+
MANIFEST
|
|
28
|
+
|
|
29
|
+
# PyInstaller
|
|
30
|
+
# Usually these files are written by a python script from a template
|
|
31
|
+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
|
32
|
+
*.manifest
|
|
33
|
+
*.spec
|
|
34
|
+
|
|
35
|
+
# Installer logs
|
|
36
|
+
pip-log.txt
|
|
37
|
+
pip-delete-this-directory.txt
|
|
38
|
+
|
|
39
|
+
# Unit test / coverage reports
|
|
40
|
+
htmlcov/
|
|
41
|
+
.tox/
|
|
42
|
+
.nox/
|
|
43
|
+
.coverage
|
|
44
|
+
.coverage.*
|
|
45
|
+
.cache
|
|
46
|
+
nosetests.xml
|
|
47
|
+
coverage.xml
|
|
48
|
+
*.cover
|
|
49
|
+
*.py,cover
|
|
50
|
+
.hypothesis/
|
|
51
|
+
.pytest_cache/
|
|
52
|
+
cover/
|
|
53
|
+
|
|
54
|
+
# Translations
|
|
55
|
+
*.mo
|
|
56
|
+
*.pot
|
|
57
|
+
|
|
58
|
+
# Django stuff:
|
|
59
|
+
*.log
|
|
60
|
+
local_settings.py
|
|
61
|
+
db.sqlite3
|
|
62
|
+
db.sqlite3-journal
|
|
63
|
+
|
|
64
|
+
# Flask stuff:
|
|
65
|
+
instance/
|
|
66
|
+
.webassets-cache
|
|
67
|
+
|
|
68
|
+
# Scrapy stuff:
|
|
69
|
+
.scrapy
|
|
70
|
+
|
|
71
|
+
# Sphinx documentation
|
|
72
|
+
docs/_build/
|
|
73
|
+
|
|
74
|
+
# PyBuilder
|
|
75
|
+
.pybuilder/
|
|
76
|
+
target/
|
|
77
|
+
|
|
78
|
+
# Jupyter Notebook
|
|
79
|
+
.ipynb_checkpoints
|
|
80
|
+
|
|
81
|
+
# IPython
|
|
82
|
+
profile_default/
|
|
83
|
+
ipython_config.py
|
|
84
|
+
|
|
85
|
+
# pyenv
|
|
86
|
+
# For a library or package, you might want to ignore these files since the code is
|
|
87
|
+
# intended to run in multiple environments; otherwise, check them in:
|
|
88
|
+
# .python-version
|
|
89
|
+
|
|
90
|
+
# pipenv
|
|
91
|
+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
|
92
|
+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
|
93
|
+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
|
94
|
+
# install all needed dependencies.
|
|
95
|
+
#Pipfile.lock
|
|
96
|
+
|
|
97
|
+
# poetry
|
|
98
|
+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
|
|
99
|
+
# This is especially recommended for binary packages to ensure reproducibility, and is more
|
|
100
|
+
# commonly ignored for libraries.
|
|
101
|
+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
|
|
102
|
+
#poetry.lock
|
|
103
|
+
|
|
104
|
+
# pdm
|
|
105
|
+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
|
|
106
|
+
#pdm.lock
|
|
107
|
+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
|
|
108
|
+
# in version control.
|
|
109
|
+
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
|
|
110
|
+
.pdm.toml
|
|
111
|
+
.pdm-python
|
|
112
|
+
.pdm-build/
|
|
113
|
+
|
|
114
|
+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
|
|
115
|
+
__pypackages__/
|
|
116
|
+
|
|
117
|
+
# Celery stuff
|
|
118
|
+
celerybeat-schedule
|
|
119
|
+
celerybeat.pid
|
|
120
|
+
|
|
121
|
+
# SageMath parsed files
|
|
122
|
+
*.sage.py
|
|
123
|
+
|
|
124
|
+
# Environments
|
|
125
|
+
.env
|
|
126
|
+
.venv
|
|
127
|
+
env/
|
|
128
|
+
venv/
|
|
129
|
+
ENV/
|
|
130
|
+
env.bak/
|
|
131
|
+
venv.bak/
|
|
132
|
+
|
|
133
|
+
# Spyder project settings
|
|
134
|
+
.spyderproject
|
|
135
|
+
.spyproject
|
|
136
|
+
|
|
137
|
+
# Rope project settings
|
|
138
|
+
.ropeproject
|
|
139
|
+
|
|
140
|
+
# mkdocs documentation
|
|
141
|
+
/site
|
|
142
|
+
|
|
143
|
+
# mypy
|
|
144
|
+
.mypy_cache/
|
|
145
|
+
.dmypy.json
|
|
146
|
+
dmypy.json
|
|
147
|
+
|
|
148
|
+
# Pyre type checker
|
|
149
|
+
.pyre/
|
|
150
|
+
|
|
151
|
+
# pytype static type analyzer
|
|
152
|
+
.pytype/
|
|
153
|
+
|
|
154
|
+
# Cython debug symbols
|
|
155
|
+
cython_debug/
|
|
156
|
+
|
|
157
|
+
# PyCharm
|
|
158
|
+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
|
|
159
|
+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
|
160
|
+
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
|
161
|
+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
|
162
|
+
#.idea/
|
|
163
|
+
|
|
164
|
+
# COCO raw output and post-processing reports (regenerate with benchmarks/*.py)
|
|
165
|
+
exdata/
|
|
166
|
+
ppdata/
|
|
167
|
+
|
|
168
|
+
# stray file written by COCO when problems are created
|
|
169
|
+
._bbob_problem_best_parameter.txt
|
|
170
|
+
|
|
171
|
+
# console logs of arm runs (run_arms.py, quick_scan): keep them out of commits
|
|
172
|
+
*.stdout
|
|
173
|
+
run.stdout
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
## Unreleased
|
|
4
|
+
|
|
5
|
+
## 0.2.0 (release of the freeze)
|
|
6
|
+
|
|
7
|
+
- Public release as `amm-optimizer` (import `amm`; the implementation keeps its code name `atm`). Packaging only: the code is that of tag `freeze-2026-10-22` (c46, config hash `2153948ebed51150`); added the `amm` alias package, `CITATION.cff`, and an AMM README. No algorithmic change.
|
|
8
|
+
|
|
9
|
+
## Earlier (pre-release notes)
|
|
10
|
+
|
|
11
|
+
- 2026-10-22, cycle 71 (all opt-in; `c46` unchanged):
|
|
12
|
+
- `Variant.stage_extend_max_per_dim`: `stage_extend_restart` only at budgets up to that many x D. Batch 89 rejected the uncapped option (losses at 1000 x D), Batch 92 accepted the option capped at 300 x D, and its confirmation on fresh ids 730-769 did not confirm (f8 + f9 +.007 [-.002, +.017]), so it is not in a preset.
|
|
13
|
+
- Batch 91 (`atm20s` on `c46`, mass check against four A/A draws) was rejected under the letter (a named depth exceeded by .001; lesson 54's addendum).
|
|
14
|
+
- `c46` is the configuration frozen for the paper (`docs/FREEZE_2026-10-22.md`, tag `freeze-2026-10-22`).
|
|
15
|
+
- 2026-10-22, cycle 70 (the gaps4 toy, `docs/research/toys/gaps4.md`; all options opt-in, `c45` unchanged):
|
|
16
|
+
- `Variant.prefix_low_beta` / `prefix_low_beta_min_dim`: in the ES prefix, a finite rugged curvature reading below the threshold keeps the (1+1)-CMA-ES where the rugged kind would be lq2 populations (Batch 88).
|
|
17
|
+
- Not in a preset: `centre_point` / `centre_point_min_dim` (a centre-point evaluation; not screened, because its f19 gain scores bbob's construction of f19), `smooth_bfgs_second` (rejected in the toy).
|
|
18
|
+
- `atm.presets`: `c46` = `c45` + `prefix_low_beta=0.15` + `prefix_low_beta_min_dim=10`, confirmed on fresh ids 690-729 (f23 at D 10-40, 100 x D +.046 [+.040, +.051]); `c46` is the best composite and the configuration frozen for the paper. Batch 89 (`stage_extend_restart` on `c45`) was rejected.
|
|
19
|
+
- 2026-10-22, cycles 67-69 (all options opt-in; `c43` and `c44` unchanged):
|
|
20
|
+
- `Variant.rugged_try_rest` (`"cutkink"`), `rugged_try_cap_per_dim`, `rugged_try_max_per_dim`: the rugged route's capped BFGS try continues to the end of the budget where its best point reads a kink (the f13 toy, `docs/research/toys/f13_cells.md`; Batch 79).
|
|
21
|
+
- `Variant.prefix_ridge_after` / `prefix_ridge_radius` / `prefix_ridge_max_per_dim`: a ridge reading of the gated prefix's SLSQP descent hands the rest of the prefix to restarted COBYQA (f13's ridge; Batch 79), with `prefix_nan_reading="plateau"` (Batch 76b).
|
|
22
|
+
- `Variant.prefix_descent_retries`: the one-descent prefixes retry a descent that did not move (the parked2 toy's `retry5`; Batch 83). Also from that toy, opt-in and not in a preset: `prefix_nan_min_per_dim`, `prefix_nan_clip`, `prefix_nan_reprobe`, `prefix_plateau_ties`, `prefix_fractal_min_dim` / `prefix_fractal_min_per_dim`, `stage_extend_restart`.
|
|
23
|
+
- `Variant.rugged_direct_beta` / `rugged_direct_min_beta`: on a rugged hand-over reading in that band, the finisher's populations start at once (the gaps3 toy; Batch 84). Also from gaps3, not in a preset: `sep_route_low` / `sep_route_low_dim` (Batches 85 and 85b rejected).
|
|
24
|
+
- `Variant.box_normalize`: `minimize` maps any box onto [-5, 5]^D and runs there (the novel-ideas toy, `docs/research/toys/novel_ideas.md`; bit-identical on bbob).
|
|
25
|
+
- From the 132-ideas stream, not in a preset: `sampled_polish_per_dim` (Batch 81 rejected) and `cma_handoff_cap_low_per_dim` / `cma_handoff_cap_low_max_per_dim` (Batches 81 and 81b rejected under the letter of their mass checks; parked).
|
|
26
|
+
- `atm.presets`: `c45` = `c44` + `rugged_try_rest="cutkink"` + `prefix_nan_reading="plateau"` + `prefix_ridge_after=7` + `prefix_ridge_max_per_dim=30` + `box_normalize` + `prefix_descent_retries=5` + `rugged_direct_beta=1.0` + `rugged_direct_min_beta=0.5`, confirmed on fresh ids 650-689 (f13 at D 5, 300 x D +.075; f13 at D 20-40, 30 x D +.095; f12-f14 at D 20-40, 100 x D +.045; f10-f12 at D 2-5, 30 x D +.047; all functions at D 5-10, 300 x D +.006); `c45` was the best composite until `c46`.
|
|
27
|
+
- 2026-10-21, cycles 63-66:
|
|
28
|
+
- `Variant.small_switch` (and `small_switch_*`): at budgets up to 10 x D the prefix's first SLSQP descent is read at two checkpoints and hands the rest to restarted COBYQA (`docs/research/toys/small10.md`, Batch 77).
|
|
29
|
+
- `Variant.prefix_nan_reading`: where an undefined prefix curvature reading goes (opt-in; Batch 76 rejected, rescreen 76b).
|
|
30
|
+
- `atm.presets`: `c44` = `c43` + `prefix_plateau_pop` from D 5 (Batch 75) + `small_switch` (Batch 77), confirmed on fresh ids 610-649 (f7 at D 5-40, 100 x D +.079; all functions at D 5-20, 10 x D +.012); `c44` is the best composite.
|
|
31
|
+
- 2026-10-21, cycle 61:
|
|
32
|
+
- `atm.cobyqa_phase.run_cobyqa_restarts`: restarted SciPy COBYQA in the box (the small-budget engines toy, `docs/research/toys/small_budget.md`).
|
|
33
|
+
- `Variant.small_engine` / `small_engine_max_dim` / `small_engine_max_per_dim` / `small_engine_radius`: the COBYQA route for the smallest budgets.
|
|
34
|
+
- `atm.presets`: `c43` = `c42` + `small_engine="cobyqa"` + `small_engine_max_dim=3`, confirmed on fresh ids 366-399 (D 2, 10 x D +.026; D 3 +.017); `c43` is the best composite.
|
|
35
|
+
- 2026-10-21, cycle 60:
|
|
36
|
+
- `Variant.basin_descents` / `basin_descents_max_per_dim` / `basin_keep_atm`: on `basin_route`'s smooth, not-multi-basin reading at D 2-3, SLSQP descents from the design, then the usual path from the design's best point with ATM's hand-over share counted after them.
|
|
37
|
+
- `atm.presets`: `c42` = `c41` + `basin_descents=1` + `basin_keep_atm`, confirmed on the D 2 ids 400-449 (f6 / f8 / f9 / f12 / f13 at D 2-3, 100-300 x D +.103; all functions there +.016).
|
|
38
|
+
- 2026-10-21, cycle 59:
|
|
39
|
+
- `qn_phase.run_scaled_bfgs(box_qp=)`: SLSQP's bound handling (the quadratic model's minimiser over the box, `_box_qp`) when -H g leaves the box; it repairs f10 (the BFGS engine toy).
|
|
40
|
+
- `QnRoute.smooth_bfgs_box_qp` / `smooth_bfgs_descents`; routes `qn43` (`qn40` + `box_qp`) and `qn44` (one `box_qp` descent, then the staged route).
|
|
41
|
+
- `atm.presets`: `c41` = `c40` + `cma_local_nonsep="qn44"`, confirmed on fresh ids 570-609 (f6 / f12 / f13 / f14 at D 5-40, 300 x D +.163; all functions +.033).
|
|
42
|
+
- 2026-10-21, cycles 56-58:
|
|
43
|
+
- `Variant.des_max_per_dim` (and the research switch `des_skip_step`): the one-descent prefix of `es_kind="slsqplq10hd"` below that many x dim (default 30, `q7ed`'s envelope).
|
|
44
|
+
- `docs/research/parked/`: the parked-arms study (catalog of gains and losses, envelopes, mitigations).
|
|
45
|
+
- `atm.presets`: `c40` = `c39` + `es_kind="slsqplq10hd"` + `prefix_full_min_per_dim=0` + `des_max_per_dim=31`, confirmed on fresh ids 530-569 (D 5-10, 10 x D +.024; D 3-5, 30 x D +.050).
|
|
46
|
+
- 2026-10-21, cycles 52-55:
|
|
47
|
+
- `atm.basin_phase`: a Sobol design's rank-quadratic fit and a curvature probe route smooth multi-basin readings (Gallagher) at D 2-3 to MLSL (`Variant.basin_route`, `basin_max_dim`, `basin_min_per_dim`, control `basin_control`).
|
|
48
|
+
- `Variant.sep_stall_min_per_dim`: the stall separability check from a budget on.
|
|
49
|
+
- `Variant.fork_seed` (research): independent continuations from one hand-over, for the learned-router dataset (`docs/research/router/`).
|
|
50
|
+
- `atm.presets`: `c39` = `c38` + `basin_route` + `sep_check="stall"` from 1000 x D, confirmed on fresh ids 490-529 (f21 + f22 at D 2-3 +.107; D 5, 3000 x D +.040).
|
|
51
|
+
- 2026-10-20, cycles 50-51:
|
|
52
|
+
- `atm.chain_phase`: a pair test of additivity (3 x dim), a band check of the coupling's orientation and linearity (6 x dim), and a coordinate search along the directions that undo a triangular coupling (the f20 toy study).
|
|
53
|
+
- `Variant.chain_route` / `sep_route` (with `chain_min_per_dim`, `sep_route_min_per_dim`, `additive_min_dim` and the control `additive_control`).
|
|
54
|
+
- `step_phase.run_step_phase` keeps its samples in arrays (bit-exact, much faster at large budgets) and takes `check_tol`.
|
|
55
|
+
- `atm.presets`: `c38` = `c37` + `chain_route` + `sep_route`, confirmed on fresh ids 326-365 (f20 at 300-3000 x D +.773; f3 at 100 x D +.711).
|
|
56
|
+
- 2026-10-20, cycles 41-48:
|
|
57
|
+
- `qn_phase.run_scaled_bfgs`: a restarted nonsmooth BFGS on forward differences along its inverse Hessian's eigenvectors, with Armijo and weak-Wolfe line searches (the local-engine toy study, idea #58).
|
|
58
|
+
- `cma_local_nonsep` routes `qn30`-`qn39`, with `QnRoute.kink_engine`, `rugged_try_*` and `rugged_ipop_low_*`. `qn38` = `qn29` + the BFGS kink route from D 5 + the capped rugged try at D 5-9 up to 500 x D + rugged IPOP from D 5 with 2000 x D left.
|
|
59
|
+
- Prefix options `Variant.prefix_plateau_pop`, `prefix_plateau_rugged` and `prefix_plateau_min_dim` (opt-in; claim P did not confirm), and the D 2 `travel_*` options (rejected, opt-in).
|
|
60
|
+
- `atm.presets`: `c37` = `c36` + `qn38`, confirmed on fresh ids 286-325 (f13 at D 10-40, 1000 x D +.304; f13 at D 5, 300 x D +.377; f15 at D 5-10, 3000 x D +.106).
|
|
61
|
+
- 2026-10-20, cycles 39-40:
|
|
62
|
+
- `atm.presets`: `c36` = `c35` + `qn29` (`gal3c` + `fract2`) + `prefix_sep_probe` / `prefix_full_per_dim=100` / `prefix_full_min_per_dim=10`, confirmed on fresh ids 246-285 (all functions at 30-100 x D +.016; f23 at D 20-40 +.044).
|
|
63
|
+
- The kink route (`qn23` / `qn24`) stays opt-in after three unconfirmed fresh-id estimates.
|
|
64
|
+
- New opt-in options: `Variant.separable_local` (cycle 40, under screen) and the research switch `local_force`; `qn28` / `qn29` routes.
|
|
65
|
+
- 2026-10-20, research cycles 35-38 (`RESULTS.md`, Batches 59-62 and the cycle 36 confirmation):
|
|
66
|
+
- `cma_local_nonsep` routes:
|
|
67
|
+
- `qn20` (`gal3c`: `run_sampled_restarts`, Gallagher restarts from the best unclaimed sample point with a gap-scaled stop);
|
|
68
|
+
- `qn21` / `qn26` (`fract` / `fract2`: `micro_slopes`, a fractal reading leaves the rugged route for restarted SLSQP; `qn26` centres the probe off the bounds);
|
|
69
|
+
- `qn23` / `qn24` (`ridge`: on a kink the cap gate refused, `kink_check` and SLSQP at a 1e-11 step, `qn24` capped at 500 x D);
|
|
70
|
+
- `qn25` (`qn24` + `gal3c`);
|
|
71
|
+
- `qn27` (`lam16`: the rugged route starts at 16x lambda; `pop_cma` rule `ipop16`).
|
|
72
|
+
- Prefix switches (cycle 38): `Variant.prefix_sep_probe`, `prefix_full_per_dim`, `prefix_full_min_per_dim` and `cheap_probe_per_dim`.
|
|
73
|
+
- `atm.presets`: `c35` = `c34` + `qn20`, confirmed on fresh ids 211-245 (f21 + f22 +.191); `c35` is the best composite. `fract` was withheld, and `ridge`'s fresh claim did not confirm (+.028, p .084).
|
|
74
|
+
- 2026-10-19, research cycles 33-34 (`RESULTS.md`, Batch 58 and the `c34` confirmation):
|
|
75
|
+
- `cma_local_nonsep` routes `qn18` (`QnRoute.cap_gate`: at the stage cap the `StallMonitor` is read once; a progressing first descent continues to SciPy's own exit) and `qn19` (`qn18` plus `second_descent_min_left_per_dim`: one more descent from a uniform point after a gated converged one with at least 400 x D left). The rejected Batch 58 arms stay opt-in: `es_kind="slsqplq10hd"` (`q7ed`) and `nm_stage="qnprefix30gd"` (`leangd`).
|
|
76
|
+
- `atm.presets`: `c34` = `c33` + `qn19`, confirmed on fresh ids 196-210 (f8 + f9 at D 20-40 +.172; every cell +.015) and characterised; `c34` is the best composite.
|
|
77
|
+
- 2026-10-19, research cycles 27-31 (`docs/research/audit_2026-10-17/RESULTS.md`, Batches 54-57):
|
|
78
|
+
- `Variant.qn_fallback="lbfgsb"` (`atm.qn_phase.run_lbfgsb_restarts`, `failure_majority`): an SLSQP call whose failed descents outnumber its converged ones hands its remaining evaluations to restarted L-BFGS-B (ftol = gtol = 0, 1e-9 step); a local stage that ends that way gives L-BFGS-B the rest of the budget. Only f12 shows the signature in `c31`'s own runs.
|
|
79
|
+
- `cma_local_nonsep` routes `qn15` (rugged readings with >= 640 x D left run unprotected IPOP from a uniform point; `pop_cma` rule `ipop8`) and `qn17` (the same from D 20 only, `QnRoute.rugged_ipop_min_dim`); `sep_check="stall"` (STEP's two-axis check once its best has not improved for two sweeps). `qn15` and `sep_check="stall"` were rejected as screened (Batch 55) and stay opt-in.
|
|
80
|
+
- `atm.presets`: `c32` = `c31` + `qn_fallback="lbfgsb"` (confirmed on fresh ids 176-185: f12 +.296, +.208 over pycma-IPOP) and `c33` = `c32` + `qn17` (confirmed on fresh ids 186-195: f17-f18 at D 20-40 +.171); `c33` is the best composite. Both are characterised bit for bit (`tests/characterisation.json`), with the two opt-in paths `qn15` and `sep_stall`.
|
|
81
|
+
- **f_opt repair (harness):** `quick_scan.raw_fopt_table` built `f_opt` as `f(0) - (f(0) - f_opt)` from a COCO data line with 10 significant digits, which put 291 f12 optima (D 2-40, mostly D 10-40, where f(0) is 1e8-1.6e9) on the wrong hundredth (by .01-.36; checked against f at COCO's x_opt). It now reads the exact value from the data header (`header_fopt`). `tools/repair_fopt_cache.py` repaired the cache and wrote `benchmarks/results/fopt_corrections_2026-10-19.json`; `load_run` re-expresses older files exactly and flags runs that stopped on a false final-target hit (`fopt_false_hit`), which `tools/rerun_false_hits.py` re-runs (deterministic per problem and seed) and rewrites on the new basis (`fopt_basis`). Every f12 score before this date is affected.
|
|
82
|
+
- `scipy>=1.16` is now a declared dependency (the research presets need SciPy).
|
|
83
|
+
- Research tooling: rule v5 (`screen_v5.py`, the `eb2` shrinkage gate of `cycle27_gates.py`), the posterior goal ledger (`goal_ledger.py`), `fresh_claims.py`, and the consolidated PDF builder (`docs/research/build_consolidated_pdf.py`).
|
|
84
|
+
- 2026-10-19 integration of the research line (`atm-audit-experiments`, composites `c23`-`c31`), the code-review branch and `refactor` (`docs/MERGE_2026-10-19.md`). Every characterised run of the research tip reproduces bit for bit, except 14 round-1 arms that use a removed option.
|
|
85
|
+
- `refactor`'s `Variant.nm_max_dim` (the simplex limit of `local_method="nelder_mead"`) is now `simplex_max_dim`; `nm_max_dim` keeps the research meaning (SciPy Nelder-Mead in `atm.nm_phase`).
|
|
86
|
+
- The research line's `ATMConfig.improved()` (the Wave 5 preset) is now `ATMConfig.improved_wave5()`; `improved()` is `refactor`'s Tier 5 hybrid.
|
|
87
|
+
- `atm.presets` holds `c23`-`c31` (`c31` is the confirmed best composite).
|
|
88
|
+
- `quick_scan` has both `--year` and `--instance-ids`, and resumes journals across the merge's added and removed fields.
|
|
89
|
+
- `refine_fraction` and `cma_handoff` exclude each other.
|
|
90
|
+
- `atm.presets`: the research composites `c23`-`c27` as named configurations (`get`, `names`, `with_changes`), equal to `benchmarks/arms/cNN_config.txt`; `quick_scan --config preset:NAME,...`.
|
|
91
|
+
- Bit-exact characterisation of `c23`-`c27`, every `cma_local_nonsep` route and all recorded arm configs on bbob (`tests/test_characterisation.py`, `tools/record_characterisation.py`).
|
|
92
|
+
- Phase routing refactored without behaviour change: `atm.qn_phase.QN_ROUTES`, `atm.api._prefix_kind`, and hand-over functions instead of the closure in `minimize` (`docs/CODE_REVIEW_2026-10-19.md`).
|
|
93
|
+
- Faster full-quadratic model steps (cached upper-triangle indices, no `n x D x D` intermediate); bit-identical results; `c26` CPU time -9 to -24% at D 2-10.
|
|
94
|
+
- Harness: `quick_scan --resume` survives new default `Variant` fields; atomic f_opt cache; `run_arms --retries`.
|
|
95
|
+
- `ATMConfig.variant` (`atm.config.Variant`): opt-in algorithm variants E01-E09 of `docs/EXPERIMENTS.md`, every default equal to the original (bit-identical, tested); `ATMConfig.to_dict/from_dict/config_hash`; `atm.plan.resolve_config`; `minimize(bounds=...)`; `CountedObjective.evaluate_columns(known=)`. Listed in `docs/DEVIATIONS.md`.
|
|
96
|
+
- `ATMConfig.improved()`: the best configuration of `docs/IMPROVEMENTS.md` (needs `bounds=`); `ATMConfig()` stays the original.
|
|
97
|
+
- Wave 7 (multimodal regression found by the Tier 4 holdout): `Variant.es_small_dim` / `es_small_max_budget_per_dim` (the local prefix only up to 30 x D in D <= 5), `refine_max_dim` (no tail above 10 dimensions) and `es_init_share`; `ATMConfig.improved()` now uses the first two, `ATMConfig.improved_wave6()` is the previous preset (commit da1ef9a). Development result: no group loses against the plain composite at 30-300 x D, multimodal f15-19 at 100 x D +.006 / +.012 (Tier 1 / 2) instead of -.048 / -.035; `docs/EXPERIMENTS.md` section 9.7. Config hashes (the schema gained fields, so every hash changed, the original's too, with identical behaviour): `ATMConfig()` 59c51e668986d345, `improved()` a2f27a8ba7e2ed96, `improved_wave6()` 0188cb38b8d456bf (was a859d9d5071ea792 before the new fields).
|
|
98
|
+
- Variants E12 `refine_fraction` (+ `refine_min_budget_per_dim`) and E13 `local_method="nelder_mead"` (+ `nm_max_dim`, `nm_refine_max_dim`): a late refinement of ATM's best point and a restarted bounded Nelder-Mead simplex search (`atm.simplex`, no SciPy) for the ES phase and the tail; `ATMConfig.improved()` uses both (Tier 1 primary +.243, was +.163; see `docs/EXPERIMENTS.md` section 9.6).
|
|
99
|
+
- `benchmarks/breakdown.py` (group and dimension tables), Wave 6 results under `benchmarks/results/scan/wave6/`.
|
|
100
|
+
- Variant E15 `covariance="rank_mu"` (+ `cov_rate`, `cov_select`, `cov_cap`, `cov_max_dim`): CMA-style full covariance for the random search, D <= 10; with the other variants it closes half of the gap to CMA-ES at 1000 x D.
|
|
101
|
+
- Variant E14 `scale_learning="diagonal"`: per-coordinate widths learned from accepted moves (f2 +.21 at 1000 x D, opt-in).
|
|
102
|
+
- Variant E21 `es_phase="prefix"` (+ `es_fraction`, `es_init_factor`, `es_max_budget_per_dim`): a (1+1)-ES for the first part of small budgets, then ATM; with the Wave 1 variants it reaches the (1+1)-ES at <= 100 x D and +.17 over the original at 1000 x D.
|
|
103
|
+
- Variants E18 `allocation="credit"`, E19 `early_accept` and `es_init_share` were added and then removed again (no aggregate gain; see `docs/DEVIATIONS.md` and `docs/EXPERIMENTS.md` section 9.2).
|
|
104
|
+
- `tests/golden/presets.json` pins the cost traces of the default, composite, Wave 6 and v2 presets.
|
|
105
|
+
- Scoring fix: exact bbob optima (the cached values floored converged runs at 2e-8); old results are rescored on loading; raw COCO evaluation (`--penalty raw`) and the 2019 start protocol (`--start coco2019`); `benchmarks/bbob_compare.py` (cocopp plots), `legacy_vs_reference.py`, `docs/IMPROVEMENTS.md`, `docs/research/gecco2019/`.
|
|
106
|
+
- `benchmarks/quick_scan.py` v2 (stable seeds, provenance, process pool, resume, cluster bootstrap), `run_arms.py`, `summarize_arms.py`.
|
|
107
|
+
- CI workflow (3 OSes, 3 Python versions, oldest NumPy, COCO parity smoke job).
|
|
108
|
+
- `py.typed` marker.
|
|
109
|
+
- COCO/bbob benchmark harness (`benchmarks/run_bbob.py`, `compare_bbob.py`, `postprocess_bbob.py`), see `docs/BENCHMARKS.md`.
|
|
110
|
+
- Faster parent selection (`best_eighth` sorts once, only the parent kind that is read is selected); bit-identical results.
|
|
111
|
+
- RNG draw ledger test and `atm.legacy_stream` (all draws kept only for stream alignment in one module).
|
|
112
|
+
- Block profiling (`atm.profiling`), see `docs/PERF.md`.
|
|
113
|
+
|
|
114
|
+
## 0.2.0.dev0
|
|
115
|
+
|
|
116
|
+
- Clean re-implementation of ATM as the `atm` package; bit-identical to `BjBodner/atm@69828c6` with `ATMConfig(strict_budget=False)`.
|
|
117
|
+
- Strict budget by default, NaN/inf handling, conductor robustness, opt-in correct second best. All differences are listed in `docs/DEVIATIONS.md`.
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
cff-version: 1.2.0
|
|
2
|
+
message: "If you use this software, please cite it as below (the paper's reference will be added when it is public)."
|
|
3
|
+
title: "AMM: budget-aware routing of classical solvers by online probes"
|
|
4
|
+
version: 0.2.0
|
|
5
|
+
license: Apache-2.0
|
|
6
|
+
type: software
|
|
7
|
+
repository-code: "https://github.com/BjBodner/amm-optimizer"
|
|
8
|
+
authors:
|
|
9
|
+
- family-names: Bodner
|
|
10
|
+
given-names: Benjy
|
|
11
|
+
keywords:
|
|
12
|
+
- black-box optimization
|
|
13
|
+
- derivative-free optimization
|
|
14
|
+
- COCO
|
|
15
|
+
- BBOB
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright [yyyy] [name of copyright owner]
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|