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
548b5690
Commit
548b5690
authored
Sep 27, 2019
by
Martin Reinecke
Browse files
Options
Browse Files
Download
Plain Diff
merge Reimar's changes
parents
9327b752
ffc6059b
Pipeline
#61317
passed with stages
in 8 minutes and 26 seconds
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
nifty5/minimization/descent_minimizers.py
nifty5/minimization/descent_minimizers.py
+6
-4
nifty5/probing.py
nifty5/probing.py
+0
-1
No files found.
nifty5/minimization/descent_minimizers.py
View file @
548b5690
...
...
@@ -166,7 +166,8 @@ class NewtonCG(DescentMinimizer):
"""
def
__init__
(
self
,
controller
,
napprox
=
0
,
line_searcher
=
None
,
name
=
None
,
nreset
=
20
,
file_name
=
None
):
nreset
=
20
,
max_cg_iterations
=
200
,
energy_reduction_factor
=
0.1
,
file_name
=
None
):
if
line_searcher
is
None
:
line_searcher
=
LineSearch
(
preferred_initial_step_size
=
1.
)
super
(
NewtonCG
,
self
).
__init__
(
controller
=
controller
,
...
...
@@ -175,15 +176,16 @@ class NewtonCG(DescentMinimizer):
self
.
_name
=
name
self
.
_nreset
=
nreset
self
.
_file_name
=
file_name
self
.
_max_cg_iterations
=
max_cg_iterations
self
.
_alpha
=
energy_reduction_factor
def
get_descent_direction
(
self
,
energy
,
old_value
=
None
):
if
old_value
is
None
:
ic
=
GradientNormController
(
iteration_limit
=
5
)
else
:
alpha
=
0.1
ediff
=
alpha
*
(
old_value
-
energy
.
value
)
ediff
=
self
.
_alpha
*
(
old_value
-
energy
.
value
)
ic
=
AbsDeltaEnergyController
(
ediff
,
iteration_limit
=
200
,
name
=
self
.
_name
,
ediff
,
iteration_limit
=
self
.
_max_cg_iterations
,
name
=
self
.
_name
,
file_name
=
self
.
_file_name
)
e
=
QuadraticEnergy
(
0
*
energy
.
position
,
energy
.
metric
,
energy
.
gradient
)
p
=
None
...
...
nifty5/probing.py
View file @
548b5690
...
...
@@ -138,7 +138,6 @@ def probe_diagonal(op, nprobes, random_type="pm1"):
def
approximation2endo
(
op
,
nsamples
):
print
(
'Calculate preconditioner'
)
sc
=
StatCalculator
()
for
_
in
range
(
nsamples
):
sc
.
add
(
op
.
draw_sample
())
...
...
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