Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sebastian Heimann
grond
Commits
d1363d8d
Commit
d1363d8d
authored
Dec 13, 2017
by
Sebastian Heimann
Browse files
Merge branch 'refactor' of gitext:heimann/grond into refactor
Conflicts: src/optimizers/highscore/optimizer.py src/problems/base.py
parents
bf3a7f7f
69f2e877
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/optimizers/highscore/optimizer.py
View file @
d1363d8d
...
...
@@ -251,16 +251,17 @@ class Chains(object):
self
,
problem
,
history
,
nchains
,
nlinks_cap
,
bootstrap_weights
):
self
.
optimizer
=
optimizer
self
.
problem
=
problem
self
.
history
=
history
self
.
nchains
=
nchains
self
.
nchains
=
optimizer
.
nbootstrap
+
1
self
.
nlinks_cap
=
nlinks_cap
self
.
chains_m
=
num
.
zeros
(
(
nchains
,
nlinks_cap
),
num
.
float
)
(
self
.
nchains
,
nlinks_cap
),
num
.
float
)
self
.
chains_i
=
num
.
zeros
(
(
nchains
,
nlinks_cap
),
num
.
int
)
(
self
.
nchains
,
nlinks_cap
),
num
.
int
)
self
.
nlinks
=
0
self
.
accept_sum
=
num
.
zeros
(
nchains
,
dtype
=
num
.
int
)
self
.
accept_sum
=
num
.
zeros
(
self
.
nchains
,
dtype
=
num
.
int
)
history
.
add_listener
(
self
)
self
.
bootstrap_weights
=
num
.
vstack
((
...
...
src/problems/base.py
View file @
d1363d8d
...
...
@@ -43,7 +43,6 @@ class Problem(Object):
def
__init__
(
self
,
**
kwargs
):
Object
.
__init__
(
self
,
**
kwargs
)
self
.
_bootstrap_weights
=
None
self
.
_target_weights
=
None
self
.
_engine
=
None
self
.
_family_mask
=
None
...
...
@@ -59,7 +58,6 @@ class Problem(Object):
def
copy
(
self
):
o
=
copy
.
copy
(
self
)
o
.
_bootstrap_weights
=
None
o
.
_target_weights
=
None
return
o
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment