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
On Thursday, 7th July from 1 to 3 pm there will be a maintenance with a short downtime of GitLab.
Open sidebar
ift
NIFTy
Commits
6a35d71f
Commit
6a35d71f
authored
Jul 08, 2017
by
Martin Reinecke
Browse files
tweaks
parent
470d9aab
Pipeline
#14522
passed with stage
in 6 minutes and 12 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
nifty/minimization/vl_bfgs.py
View file @
6a35d71f
...
@@ -185,30 +185,32 @@ class InformationStore(object):
...
@@ -185,30 +185,32 @@ class InformationStore(object):
result
=
np
.
empty
((
2
*
m
+
1
,
2
*
m
+
1
),
dtype
=
np
.
float
)
result
=
np
.
empty
((
2
*
m
+
1
,
2
*
m
+
1
),
dtype
=
np
.
float
)
# update the stores
# update the stores
if
(
m
>
0
):
k1
=
(
k
-
1
)
%
m
for
i
in
xrange
(
m
):
for
i
in
xrange
(
m
):
self
.
_ss_store
[(
k
-
m
+
i
)
%
m
,(
k
-
1
)
%
m
]
=
self
.
_ss_store
[(
k
-
1
)
%
m
,(
k
-
m
+
i
)
%
m
]
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
s
[
k
-
1
])
kmi
=
(
k
-
m
+
i
)
%
m
self
.
_yy_store
[(
k
-
m
+
i
)
%
m
,(
k
-
1
)
%
m
]
=
self
.
_yy_store
[(
k
-
1
)
%
m
,(
k
-
m
+
i
)
%
m
]
=
self
.
y
[
k
-
m
+
i
].
vdot
(
self
.
y
[
k
-
1
])
self
.
_ss_store
[
kmi
,
k1
]
=
self
.
_ss_store
[
k1
,
kmi
]
\
self
.
_sy_store
[(
k
-
m
+
i
)
%
m
,(
k
-
1
)
%
m
]
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
y
[
k
-
1
])
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
s
[
k
-
1
])
self
.
_yy_store
[
kmi
,
k1
]
=
self
.
_yy_store
[
k1
,
kmi
]
\
=
self
.
y
[
k
-
m
+
i
].
vdot
(
self
.
y
[
k
-
1
])
self
.
_sy_store
[
kmi
,
k1
]
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
y
[
k
-
1
])
for
j
in
xrange
(
m
-
1
):
for
j
in
xrange
(
m
-
1
):
self
.
_sy_store
[
(
k
-
1
)
%
m
,(
k
-
m
+
j
)
%
m
]
=
self
.
s
[
k
-
1
].
vdot
(
self
.
y
[
k
-
m
+
j
])
self
.
_sy_store
[
k1
,(
k
-
m
+
j
)
%
m
]
=
self
.
s
[
k
-
1
].
vdot
(
self
.
y
[
k
-
m
+
j
])
for
i
in
xrange
(
m
):
for
i
in
xrange
(
m
):
kmi
=
(
k
-
m
+
i
)
%
m
for
j
in
xrange
(
m
):
for
j
in
xrange
(
m
):
result
[
i
,
j
]
=
self
.
_ss_store
[(
k
-
m
+
i
)
%
m
,
(
k
-
m
+
j
)
%
m
]
kmj
=
(
k
-
m
+
j
)
%
m
result
[
i
,
j
]
=
self
.
_ss_store
[
kmi
,
kmj
]
sy_ij
=
self
.
_sy_store
[(
k
-
m
+
i
)
%
m
,
(
k
-
m
+
j
)
%
m
]
result
[
i
,
m
+
j
]
=
result
[
m
+
j
,
i
]
=
self
.
_sy_store
[
kmi
,
kmj
]
result
[
i
,
m
+
j
]
=
sy_ij
result
[
m
+
j
,
i
]
=
sy_ij
result
[
m
+
i
,
m
+
j
]
=
self
.
_yy_store
[(
k
-
m
+
i
)
%
m
,
(
k
-
m
+
j
)
%
m
]
result
[
m
+
i
,
m
+
j
]
=
self
.
_yy_store
[(
k
-
m
+
i
)
%
m
,
(
k
-
m
+
j
)
%
m
]
sgrad_i
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
last_gradient
)
sgrad_i
=
self
.
s
[
k
-
m
+
i
].
vdot
(
self
.
last_gradient
)
result
[
2
*
m
,
i
]
=
sgrad_i
result
[
2
*
m
,
i
]
=
result
[
i
,
2
*
m
]
=
sgrad_i
result
[
i
,
2
*
m
]
=
sgrad_i
ygrad_i
=
self
.
y
[
k
-
m
+
i
].
vdot
(
self
.
last_gradient
)
ygrad_i
=
self
.
y
[
k
-
m
+
i
].
vdot
(
self
.
last_gradient
)
result
[
2
*
m
,
m
+
i
]
=
ygrad_i
result
[
2
*
m
,
m
+
i
]
=
result
[
m
+
i
,
2
*
m
]
=
ygrad_i
result
[
m
+
i
,
2
*
m
]
=
ygrad_i
result
[
2
*
m
,
2
*
m
]
=
self
.
last_gradient
.
norm
()
result
[
2
*
m
,
2
*
m
]
=
self
.
last_gradient
.
norm
()
...
...
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