Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

NIFTy
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

ab2a8289

There was a problem fetching the pipeline summary.

Commit ab2a8289 authored 7 years ago by Theo Steininger

Downloads
- Plain Diff

Merge branch 'master' into working_on_demos

# Conflicts:
#	nifty/minimization/relaxed_newton.py

parents 05eeeabb 89e27a11

No related branches found

No related tags found

1 merge request!120Working on demos

Pipeline #

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

nifty/field.py 2 additions, 7 deletions

nifty/field.py
nifty/minimization/descent_minimizer.py 3 additions, 3 deletions

nifty/minimization/descent_minimizer.py
nifty/minimization/line_searching/line_search.py 10 additions, 10 deletions

nifty/minimization/line_searching/line_search.py
nifty/minimization/line_searching/line_search_strong_wolfe.py 5 additions, 5 deletions

...y/minimization/line_searching/line_search_strong_wolfe.py
nifty/minimization/relaxed_newton.py 4 additions, 7 deletions

nifty/minimization/relaxed_newton.py
nifty/minimization/steepest_descent.py 3 additions, 4 deletions

nifty/minimization/steepest_descent.py
nifty/minimization/vl_bfgs.py 54 additions, 204 deletions

nifty/minimization/vl_bfgs.py

with 81 additions and 240 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment