Skip to content
GitLab
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
fe8e199b
Commit
fe8e199b
authored
Jun 15, 2016
by
Sebastian Heimann
Browse files
solver: changed transition cooling from linear to exponential
parent
5d80a362
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/core.py
View file @
fe8e199b
...
...
@@ -1176,7 +1176,7 @@ def solve(problem,
niter_inject
=
0
niter
=
niter_inject
+
niter_uniform
+
niter_transition
+
\
niter_explorative
+
niter_non_explorative
niter_explorative
+
niter_non_explorative
iiter
=
0
sbx
=
None
...
...
@@ -1202,15 +1202,18 @@ def solve(problem,
else
:
phase
=
'non_explorative'
factor
=
1
.0
factor
=
0
.0
if
phase
==
'transition'
:
factor
=
scatter_scale_transition
+
\
(
scatter_scale
-
scatter_scale_transition
)
/
\
((
iiter
-
niter_uniform
-
niter_inject
)
/
float
(
niter_transition
))
else
:
factor
=
scatter_scale
*
1.0
T
=
float
(
niter_transition
)
A
=
scatter_scale_transition
B
=
scatter_scale
tau
=
T
/
(
math
.
log
(
A
)
-
math
.
log
(
B
))
t0
=
math
.
log
(
A
)
*
T
/
(
math
.
log
(
A
)
-
math
.
log
(
B
))
t
=
float
(
iiter
-
niter_uniform
-
niter_inject
)
factor
=
num
.
exp
(
-
(
t
-
t0
)
/
tau
)
elif
phase
in
(
'explorative'
,
'non_explorative'
):
factor
=
scatter_scale
ntries_preconstrain
=
0
ntries_sample
=
0
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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