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
13
Merge Requests
13
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
e0f1f873
Commit
e0f1f873
authored
Aug 18, 2017
by
Theo Steininger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy
parents
39e7ec15
e1843d4d
Pipeline
#16862
passed with stages
in 18 minutes and 17 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
nifty/minimization/line_searching/line_search_strong_wolfe.py
...y/minimization/line_searching/line_search_strong_wolfe.py
+1
-1
No files found.
nifty/minimization/line_searching/line_search_strong_wolfe.py
View file @
e0f1f873
...
@@ -116,7 +116,7 @@ class LineSearchStrongWolfe(LineSearch):
...
@@ -116,7 +116,7 @@ class LineSearchStrongWolfe(LineSearch):
if
self
.
preferred_initial_step_size
is
not
None
:
if
self
.
preferred_initial_step_size
is
not
None
:
alpha1
=
self
.
preferred_initial_step_size
alpha1
=
self
.
preferred_initial_step_size
elif
old_phi_0
is
not
None
and
phiprime_0
!=
0
:
elif
old_phi_0
is
not
None
:
alpha1
=
min
(
1.0
,
1.01
*
2
*
(
phi_0
-
old_phi_0
)
/
phiprime_0
)
alpha1
=
min
(
1.0
,
1.01
*
2
*
(
phi_0
-
old_phi_0
)
/
phiprime_0
)
if
alpha1
<
0
:
if
alpha1
<
0
:
alpha1
=
1.0
alpha1
=
1.0
...
...
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