Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

NIFTy
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

c6f46393

Commit c6f46393 authored 8 years ago by Theo Steininger

Downloads
- Plain Diff

Merge branch 'master' into index_games2

# Conflicts:
#	nifty/spaces/power_space/power_indices.py
#	test/test_spaces/test_power_space.py

parents 0c50175d 5d5a2701

No related branches found

No related tags found

2 merge requests!171Master,!163Index games2

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

demos/wiener_filter_easy.py 30 additions, 22 deletions

demos/wiener_filter_easy.py
nifty/config/nifty_config.py 1 addition, 1 deletion

nifty/config/nifty_config.py
nifty/field.py 9 additions, 16 deletions

nifty/field.py
nifty/operators/fft_operator/fft_operator.py 0 additions, 1 deletion

nifty/operators/fft_operator/fft_operator.py
nifty/operators/smoothing_operator/fft_smoothing_operator.py 22 additions, 4 deletions

nifty/operators/smoothing_operator/fft_smoothing_operator.py
nifty/spaces/lm_space/lm_space.py 0 additions, 16 deletions

nifty/spaces/lm_space/lm_space.py
nifty/spaces/rg_space/rg_space.py 1 addition, 21 deletions

nifty/spaces/rg_space/rg_space.py
nifty/spaces/space/space.py 20 additions, 21 deletions

nifty/spaces/space/space.py
test/test_operators/test_fft_operator.py 4 additions, 1 deletion

test/test_operators/test_fft_operator.py
test/test_spaces/test_lm_space.py 6 additions, 9 deletions

test/test_spaces/test_lm_space.py
test/test_spaces/test_rg_space.py 11 additions, 41 deletions

test/test_spaces/test_rg_space.py

with 104 additions and 153 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