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
23100d5a
Commit
23100d5a
authored
Aug 15, 2017
by
Marius Isken
Browse files
Bugfixes
parent
5a49ad27
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
src/optimizers/highscore.py
deleted
100644 → 0
View file @
5a49ad27
This diff is collapsed.
Click to expand it.
src/
optimiz
ers/__init__.py
→
src/
solv
ers/__init__.py
View file @
23100d5a
File moved
src/
optimiz
ers/base.py
→
src/
solv
ers/base.py
View file @
23100d5a
...
...
@@ -67,6 +67,10 @@ class SolverState(object):
return
SimpleTimedelta
(
seconds
=
(
self
.
niter
-
self
.
iiter
)
/
self
.
iter_per_second
)
@
property
def
nparameters
(
self
):
return
len
(
self
.
parameter_names
)
class
Solver
(
object
):
state
=
SolverState
()
...
...
src/solvers/highscore.py
View file @
23100d5a
...
...
@@ -23,7 +23,7 @@ def excentricity_compensated_probabilities(xs, sbx, factor):
((
xs
[
num
.
newaxis
,
:,
:]
-
xs
[:,
num
.
newaxis
,
:])
*
scale
[
num
.
newaxis
,
num
.
newaxis
,
:])
**
2
,
axis
=
2
)
probabilities
=
1.0
/
num
.
sum
(
distances_sqr_all
<
1.0
,
axis
=
1
)
print
num
.
sort
(
num
.
sum
(
distances_sqr_all
<
1.0
,
axis
=
1
))
#
print num.sort(num.sum(distances_sqr_all < 1.0, axis=1))
probabilities
/=
num
.
sum
(
probabilities
)
return
probabilities
...
...
@@ -105,15 +105,14 @@ def solve(problem,
state
.
problem_name
=
problem
.
name
state
.
parameter_names
=
problem
.
parameter_names
+
[
'Misfit'
]
npar
=
len
(
state
.
parameter_names
)
state
.
parameter_sets
=
OrderedDict
()
state
.
parameter_sets
[
'BS mean'
]
=
num
.
zeros
(
npar
)
state
.
parameter_sets
[
'BS std'
]
=
num
.
zeros
(
npar
)
state
.
parameter_sets
[
'Global mean'
]
=
num
.
zeros
(
npar
)
state
.
parameter_sets
[
'Global std'
]
=
num
.
zeros
(
npar
)
state
.
parameter_sets
[
'Global best'
]
=
num
.
zeros
(
npar
)
state
.
parameter_sets
[
'BS mean'
]
=
num
.
zeros
(
state
.
nparameters
)
state
.
parameter_sets
[
'BS std'
]
=
num
.
zeros
(
state
.
nparameters
)
state
.
parameter_sets
[
'Global mean'
]
=
num
.
zeros
(
state
.
nparameters
)
state
.
parameter_sets
[
'Global std'
]
=
num
.
zeros
(
state
.
nparameters
)
state
.
parameter_sets
[
'Global best'
]
=
num
.
zeros
(
state
.
nparameters
)
for
par
in
state
.
parameter_sets
.
values
():
par
.
fill
(
num
.
nan
)
...
...
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