Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIFTy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ift
NIFTy
Commits
4380d2b9
Commit
4380d2b9
authored
Aug 10, 2019
by
Philipp Arras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new minimization heuristics to getting_started_3
parent
4c3c5422
Pipeline
#53583
passed with stages
in 8 minutes and 13 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
.gitignore
.gitignore
+1
-0
demos/getting_started_3.py
demos/getting_started_3.py
+12
-5
nifty5/plot.py
nifty5/plot.py
+4
-4
No files found.
.gitignore
View file @
4380d2b9
...
...
@@ -2,6 +2,7 @@
git_version.py
# custom
*.txt
setup.cfg
.idea
.DS_Store
...
...
demos/getting_started_3.py
View file @
4380d2b9
...
...
@@ -103,10 +103,15 @@ if __name__ == '__main__':
data
=
signal_response
(
mock_position
)
+
N
.
draw_sample
()
# Minimization parameters
ic_sampling
=
ift
.
GradientNormController
(
iteration_limit
=
100
)
ic_newton
=
ift
.
GradInfNormController
(
name
=
'Newton'
,
tol
=
1e-7
,
iteration_limit
=
35
)
minimizer
=
ift
.
NewtonCG
(
ic_newton
)
fo
=
'energy0.txt'
fs
=
'energy1.txt'
fi
=
'energy2.txt'
ic_sampling
=
ift
.
AbsDeltaEnergyController
(
0.5
,
convergence_level
=
5
,
iteration_limit
=
100
,
file_name
=
fs
)
ic_newton
=
ift
.
GradInfNormController
(
name
=
'Newton'
,
tol
=
1e-7
,
iteration_limit
=
35
,
file_name
=
fo
)
minimizer
=
ift
.
NewtonCG
(
ic_newton
,
file_name
=
fi
)
# Set up likelihood and information Hamiltonian
likelihood
=
ift
.
GaussianEnergy
(
mean
=
data
,
...
...
@@ -128,7 +133,7 @@ if __name__ == '__main__':
# Draw new samples to approximate the KL five times
for
i
in
range
(
5
):
# Draw new samples and minimize KL
KL
=
ift
.
MetricGaussianKL
(
mean
,
H
,
N_samples
)
KL
=
ift
.
MetricGaussianKL
(
mean
,
H
,
N_samples
,
napprox
=
20
)
KL
,
convergence
=
minimizer
(
KL
)
mean
=
KL
.
position
...
...
@@ -159,3 +164,5 @@ if __name__ == '__main__':
linewidth
=
[
1.
]
*
len
(
powers
)
+
[
3.
,
3.
])
plot
.
output
(
ny
=
1
,
nx
=
3
,
xsize
=
24
,
ysize
=
6
,
name
=
filename_res
)
print
(
"Saved results as '{}'."
.
format
(
filename_res
))
ift
.
energy_history_analysis
(
fo
,
fi
,
fs
,
fname
=
'energy_history.png'
)
nifty5/plot.py
View file @
4380d2b9
...
...
@@ -555,7 +555,7 @@ def energy_history_analysis(fname_outer, fname_inner, fname_sampling,
tsa
,
esa
,
_
=
np
.
loadtxt
(
fname_sampling
,
delimiter
=
' '
).
T
tou
,
eou
,
_
=
np
.
loadtxt
(
fname_outer
,
delimiter
=
' '
).
T
tin
,
ein
,
_
=
np
.
loadtxt
(
fname_inner
,
delimiter
=
' '
).
T
t0
=
np
.
min
([
tsa
,
tou
,
tin
])
t0
=
np
.
min
([
*
tsa
,
*
tou
,
*
tin
])
tsa
=
(
tsa
-
t0
)
/
3600
tou
=
(
tou
-
t0
)
/
3600
tin
=
(
tin
-
t0
)
/
3600
...
...
@@ -569,11 +569,11 @@ def energy_history_analysis(fname_outer, fname_inner, fname_sampling,
ax0
.
legend
([
p1
,
p2
],
[
p1
.
get_label
(),
p2
.
get_label
()])
ax1
.
scatter
(
tou
,
eou
,
marker
=
'>'
,
c
=
'g'
)
ax1
.
set_ylabel
(
'Newton energy'
)
ax1
.
set_yscale
(
'log'
)
#
ax1.set_yscale('log')
ax1
.
set_xlabel
(
"Time [h]"
)
plt
.
tight_layout
()
if
fname
is
None
:
plt
.
savefig
(
fname
)
else
:
plt
.
show
()
else
:
plt
.
savefig
(
fname
)
plt
.
close
()
Write
Preview
Markdown
is supported
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