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.

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

Plugging new parametrization inside instrumentation and optimization #391

Merged
merged 150 commits into from
Jan 17, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
2c50068
Prepare a new instrumentation pattern
jrapin Nov 14, 2019
f12070d
Value as property
jrapin Nov 14, 2019
fc87a3e
setter
jrapin Nov 14, 2019
da3e7b7
Random state and constraint
jrapin Nov 15, 2019
c3ab658
naming
jrapin Nov 15, 2019
41a86b4
nits
jrapin Nov 15, 2019
7f0f9a7
Split core features and secondary features
jrapin Nov 15, 2019
fce691b
More explicit structure
jrapin Nov 16, 2019
a27e0c1
missing
jrapin Nov 16, 2019
1c822e9
Feature test
jrapin Nov 16, 2019
1c7c523
Feature test
jrapin Nov 16, 2019
38020a6
fix
jrapin Nov 16, 2019
9c10389
Add name setter
jrapin Nov 16, 2019
1292002
Compliant dict
jrapin Nov 16, 2019
c185d7e
simplified spawn
jrapin Nov 16, 2019
4cbf118
Solve random_state propagation
jrapin Nov 16, 2019
20c315e
Solve random_state propagation
jrapin Nov 16, 2019
9ce1cd6
Constraint support
jrapin Nov 16, 2019
402c2f4
Array recombination
jrapin Nov 16, 2019
7b10af6
recombine
jrapin Nov 16, 2019
233dfc5
ParametersList
jrapin Nov 16, 2019
9cbfece
Starting choice parameter
jrapin Nov 16, 2019
9760530
Renaming mel-syd
jrapin Dec 1, 2019
ef9920e
Add generation + renaming (han-par)
jrapin Dec 7, 2019
6c8c55f
Added preliminary choice test
jrapin Dec 8, 2019
b9748d0
Better test
jrapin Dec 8, 2019
22d8b4a
Simplified access
jrapin Dec 9, 2019
ac71642
More simplification
jrapin Dec 9, 2019
900c025
Better access
jrapin Dec 9, 2019
3e33192
Start solving Choice test
jrapin Dec 9, 2019
ea74e47
Fixing all Choice main tests
jrapin Dec 9, 2019
6959a6a
Merge branch 'master' into instrumentation_v3
jrapin Dec 10, 2019
c4da7b9
nits
jrapin Dec 10, 2019
eafd9ce
Add instrumentation class
jrapin Dec 10, 2019
6ebc342
Restructure
jrapin Dec 10, 2019
b00178a
Merge branch 'master' into instrumentation_v3
jrapin Dec 10, 2019
7ad71a7
Simplify spawn
jrapin Dec 10, 2019
834582f
nits
jrapin Dec 10, 2019
91b08c6
Basic implementation of scalar
jrapin Dec 10, 2019
159e79d
Merge branch 'master' into instrumentation_v3
jrapin Dec 11, 2019
a01539d
Adding exponent to array
jrapin Dec 11, 2019
87c7c63
Log distributed data
jrapin Dec 11, 2019
56c7c69
Warning for bounds
jrapin Dec 11, 2019
b4ee7e1
Typing fix
jrapin Dec 11, 2019
5e78ac0
Better bound warning
jrapin Dec 11, 2019
9798394
Default to mutable sigma
jrapin Dec 11, 2019
bc3ea96
Better yet
jrapin Dec 11, 2019
e91c8f7
Samping
jrapin Dec 11, 2019
b11a59d
nit
jrapin Dec 11, 2019
4c01ca3
mypyfix
jrapin Dec 12, 2019
a2b6593
Convert other instances to std
jrapin Dec 12, 2019
9ba6758
Correction
jrapin Dec 12, 2019
4f9608e
Better tested conversion
jrapin Dec 12, 2019
51c0f00
Warning against lambdas
jrapin Dec 12, 2019
83ef082
Simplified initialization
jrapin Dec 12, 2019
a8d2511
Remove Ng prefix for simplicitys sake
jrapin Dec 12, 2019
98278f1
Disallow logarithmic with non-positive value
jrapin Dec 12, 2019
3ee9e5f
Activate other bounds, yet to be tested
jrapin Dec 12, 2019
ceacae3
Tested constraints
jrapin Dec 12, 2019
fe32abb
Removed warning
jrapin Dec 12, 2019
610effa
typing
jrapin Dec 12, 2019
813f6f3
Restructure as parametrization
jrapin Dec 13, 2019
9381212
Remove useless ignore
jrapin Dec 13, 2019
7868f87
Cast to int + beginning docstrings
jrapin Dec 13, 2019
c59d61a
Hopefully working typing
jrapin Dec 13, 2019
e16265a
Non-deterministic by default
jrapin Dec 13, 2019
77c99ec
Better docstrings
jrapin Dec 13, 2019
5aae810
More docstrings again
jrapin Dec 13, 2019
b8a9b33
Docstrings...
jrapin Dec 13, 2019
f473e54
Updated naming pattern and tested
jrapin Dec 13, 2019
c1717d9
Initial tag system
jrapin Dec 13, 2019
a559b6f
Updates and simplifications
jrapin Dec 16, 2019
83eaf5e
Add OrderedChoice
jrapin Dec 16, 2019
6040625
Share code for selection parameters
jrapin Dec 16, 2019
13e6a67
Names
jrapin Dec 16, 2019
d9a8ec7
Better docstrings
jrapin Dec 16, 2019
68c260f
Small comment
jrapin Dec 16, 2019
5f306be
file renaming
jrapin Dec 16, 2019
502b8d9
Compatibility for OrderedDiscrete
jrapin Dec 16, 2019
537efaf
[PR on instrumentation_v3] Convert all subparameters into Parameter (…
jrapin Dec 18, 2019
c98e6c1
Choice length
jrapin Dec 18, 2019
7125b77
Make Variable an Parameter/Instrumentation
jrapin Dec 19, 2019
b1a4f33
More tests
jrapin Dec 19, 2019
d3b8e2d
Constant correction
jrapin Dec 19, 2019
a2bce6f
Typing
jrapin Dec 19, 2019
5b3b0c0
Change typing to Parameter
jrapin Dec 19, 2019
28c60a3
Test both pipelines
jrapin Dec 19, 2019
3925292
Update core.py
jrapin Dec 19, 2019
d235a6f
Typing
jrapin Dec 19, 2019
2cf7566
details
jrapin Dec 19, 2019
ad839d7
Add set cheap constraint for compatiblity
jrapin Dec 19, 2019
d492182
skip
jrapin Dec 19, 2019
a2187f4
nit
jrapin Dec 19, 2019
484be3d
Merge base parameter and parameter
jrapin Dec 19, 2019
bc7ae1f
comment and renaming
jrapin Dec 19, 2019
2ba4ee6
comments
jrapin Dec 19, 2019
c1a82c1
Update description of constraint + start fixing sampling
jrapin Dec 20, 2019
0d7e108
Simplify choice
jrapin Dec 20, 2019
b9dea96
Move discretization and transforms modules
jrapin Dec 20, 2019
f8b6b8b
isinstance
jrapin Dec 20, 2019
f2e4017
Trying to remove some old code
jrapin Dec 20, 2019
1cd1756
Sanity check
jrapin Dec 20, 2019
94b2ac9
Merge branch 'instrumentation_v3' into variable_as_instrumentation
jrapin Dec 20, 2019
731ca05
Remove all Instrumentation
jrapin Dec 20, 2019
8d13ea7
Plug new instrumentation
jrapin Dec 20, 2019
f95a828
Improve perf with new Array
jrapin Dec 20, 2019
3c70b19
Flag failing instrumentations
jrapin Dec 20, 2019
a71db0d
Add a freezing mechanism
jrapin Dec 21, 2019
72080b8
Merging parametrization with freezing
jrapin Dec 21, 2019
bf0db82
Freezing and faster compatibility
jrapin Dec 21, 2019
546d51d
Start updating descriptros
jrapin Dec 21, 2019
038ec54
Updated descriptor pattern
jrapin Dec 21, 2019
8cd3eac
Enforce keyword arg
jrapin Dec 24, 2019
b6bdbb9
Solve initial value issue
jrapin Dec 24, 2019
56e308f
Update benchmark
jrapin Dec 24, 2019
1f2b9fc
Update functions
jrapin Dec 24, 2019
987cb1a
Use new choces
jrapin Dec 24, 2019
15076cb
transfor descriptors to children
jrapin Dec 24, 2019
b85b26b
Solve nan issue
jrapin Dec 24, 2019
4657833
No name shortening
jrapin Dec 24, 2019
2426f43
Merge branch 'master' into instrumentation_v3
jrapin Dec 24, 2019
d6eb182
Start merging master
jrapin Dec 24, 2019
4281962
Cleaner typing
jrapin Dec 25, 2019
01e6b9d
Add helpers
jrapin Dec 25, 2019
7bdecac
Merging master
jrapin Dec 25, 2019
0890214
Merge branch 'master' into instrumentation_v3
jrapin Dec 25, 2019
521cc56
Merge branch 'instrumentation_v3' into variable_as_instrumentation
jrapin Dec 25, 2019
3557470
Basic update of the documentation
jrapin Dec 25, 2019
0b9dbdd
Start adding deprecation warnings
jrapin Dec 25, 2019
4256956
Merge master
jrapin Dec 26, 2019
e558760
Merging master
jrapin Dec 26, 2019
160d3dc
Removing old constraint calls
jrapin Dec 27, 2019
64eea33
Remove from_value in favor of spawn_child param
jrapin Dec 27, 2019
f726de6
Deprecation warning for set_cheap_constraint_checker
jrapin Dec 27, 2019
1dab9a0
Merge branch 'instrumentation_v3' into variable_as_instrumentation
jrapin Dec 27, 2019
988ec11
Deprecation warnings for old descriptors
jrapin Dec 27, 2019
bac0150
Merging master (containing parameter)
jrapin Dec 30, 2019
c88893f
Merge master with ExperimentFunction (#432)
jrapin Jan 6, 2020
5281af4
Merge master again
jrapin Jan 6, 2020
efdf342
Minor documentation edit
jrapin Jan 6, 2020
4cd6de9
Change typing import to tp
jrapin Jan 6, 2020
6742296
Merge master
jrapin Jan 6, 2020
13ffb23
Solve compatibility bug
jrapin Jan 7, 2020
955942b
Merging master
jrapin Jan 7, 2020
7134287
Merge branch 'master' into variable_as_instrumentation
jrapin Jan 14, 2020
43d2014
merge
jrapin Jan 15, 2020
06b7c63
Merge branch 'master' into variable_as_instrumentation
jrapin Jan 15, 2020
0a17db6
Center and reduce standardized_space relatively to reference (#461)
jrapin Jan 16, 2020
675d929
Add test for offset
jrapin Jan 17, 2020
8791fb8
Merge branch 'master' into variable_as_instrumentation
jrapin Jan 17, 2020
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
Prev Previous commit
Next Next commit
Names
  • Loading branch information
jrapin committed Dec 16, 2019
commit 13e6a67b82738ed705f69b731e7da74cf1dc256e
8 changes: 8 additions & 0 deletions nevergrad/parametrization/selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ def __init__(
super().__init__(choices=lchoices, weights=Array(shape=(len(lchoices),), mutable_sigma=False))
self._deterministic = deterministic

def _get_name(self) -> str:
name = super()._get_name()
cls = self.__class__.__name__
assert name.startswith(cls)
if self._deterministic:
name = cls + "{det}" + name[len(cls):]
return name

@property
def descriptors(self) -> core.Descriptors:
return core.Descriptors(deterministic=self._deterministic & self.choices.descriptors.deterministic,
Expand Down
3 changes: 3 additions & 0 deletions nevergrad/parametrization/test_parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ def test_parameters_basic_features(param: Parameter) -> None:
(par.Scalar().set_integer_casting(), "Scalar{int}[recombination=average,sigma=Log{exp=1.2}[recombination=average,sigma=1.0]]"),
(par.Instrumentation(par.Array(shape=(2,)), string="blublu", truc="plop"),
"Instrumentation(Tuple(Array{(2,)}[recombination=average,sigma=1.0]),Dict(string=blublu,truc=plop))"),
(par.Choice([1, 12]), "Choice(choices=Tuple(1,12),weights=Array{(2,)}[recombination=average,sigma=1.0])"),
(par.Choice([1, 12], deterministic=True), "Choice{det}(choices=Tuple(1,12),weights=Array{(2,)}[recombination=average,sigma=1.0])"),
(par.TransitionChoice([1, 12]), "TransitionChoice(choices=Tuple(1,12),transitions=[1. 1.])")
]
)
def test_parameter_names(param: Parameter, name: str) -> None:
Expand Down