Commits · 0f817b6e283152561e9b785d6699749816c8e2f5 · ift / NIFTy

10 May, 2017 2 commits
- corrected the docstrings to respect inhereted docstrings and added docsgtrings... · 0f817b6e
  Reimar H Leike authored May 10, 2017
```
corrected the docstrings to respect inhereted docstrings and added docsgtrings for all methods where they were missing
```
  0f817b6e
- Changed RGSpace fft smoothing kernel to be Gaussian, added some · addc84e3
  Reimar H Leike authored May 10, 2017
```
Docstrings
```
  addc84e3
08 May, 2017 3 commits
- Merge branch 'space_docstrings' into 'master' · 68823ce1
  Theo Steininger authored May 08, 2017
```
Space docstrings

See merge request !83
```
  68823ce1
- Cleaned up the Figure classes · d1bb1965
  Theo Steininger authored May 08, 2017
  
  d1bb1965
- Fixed the MPI inference in PowerIndices. · b4b74105
  Theo Steininger authored May 08, 2017
  
  b4b74105
06 May, 2017 5 commits
- Fixed typo in space.py · f70b2ae8
  Theo Steininger authored May 07, 2017
  
  f70b2ae8
- Merge branch 'space_docstring' into space_docstrings · 758c8ef5
  Theo Steininger authored May 07, 2017
```
# Conflicts:
#	nifty/spaces/space/space.py
```
  758c8ef5
- Updated docstring of Space class. · 26eb1cae
  Theo Steininger authored May 07, 2017
  
  26eb1cae
- PEP8 cosmetics. · 89330a8d
  Theo Steininger authored May 07, 2017
  
  89330a8d
- improve the docstrings of the Space-related classes · e5d5cd39
  Martin Reinecke authored May 06, 2017
  
  e5d5cd39
02 May, 2017 6 commits
- Renamed Plot -> ScatterPlot and moved the file. · 65aa95cf
  Theo Steininger authored May 02, 2017
  
  65aa95cf
- Merge branch 'master' into plotting · 5d23df47
  Theo Steininger authored May 02, 2017
  
  5d23df47
- Fixed dtype for real_signal == False. · e5f51246
  Theo Steininger authored May 02, 2017
  
  e5f51246
- Removed remnant dtype in Field. · 3aebc588
  Theo Steininger authored May 02, 2017
  
  3aebc588
- Removed dtype remnants from FieldArray · cb27dc72
  Theo Steininger authored May 02, 2017
  
  cb27dc72
- Fixed _global_id exclusion in domain_object.py · 38c492f6
  Theo Steininger authored May 02, 2017
  
  38c492f6
01 May, 2017 9 commits
- Merge branch 'issue77_2' into 'master' · c385b8bc
  Theo Steininger authored May 02, 2017
```
try to address hashing/equality problems and fix caches

See merge request !72
```
  c385b8bc
- PEP8 cosmetics. · bd1e0f27
  Theo Steininger authored May 02, 2017
  
  bd1e0f27
- Merge branch 'master' into issue77_2 · a0b26666
  Theo Steininger authored May 02, 2017
  
  a0b26666
- re-factoring fixes; marker defaults; colormaps for heatmaps; added plot functions in figure_base · 56d76cec
  Mihai Baltac authored May 01, 2017
  
  56d76cec
- Merge branch 'multi_power_synth' into 'master' · 42951308
  Theo Steininger authored May 01, 2017
```
Multi power synth

See merge request !78
```
  42951308
- Fixed infer_dtype in Field · 1f5a6c6c
  Theo Steininger authored May 01, 2017
  
  1f5a6c6c
- Merge branch 'master' into multi_power_synth · 6c70837a
  Theo Steininger authored May 01, 2017
```
# Conflicts:
#	nifty/field.py
```
  6c70837a
- Merge branch 'space_without_dtype_2' into 'master' · 9ba59e8c
  Theo Steininger authored May 01, 2017
```
Space without dtype 2

See merge request !77
```
  9ba59e8c
- Small consistency fixes for spaces and FFTOperators. · 64a27773
  Theo Steininger authored May 01, 2017
  
  64a27773
30 Apr, 2017 5 commits
- Merge branch 'master' into 'space_without_dtype_2' · c6c1bbb9
  Theo Steininger authored May 01, 2017
```
Master

See merge request !76
```
  c6c1bbb9
- Merge branch 'master' into 'multi_power_synth' · 71512cab
  Theo Steininger authored May 01, 2017
```
Master

See merge request !75
```
  71512cab
- Fixed hermitianization in Field for power_synthesize · 35acfb0c
  Theo Steininger authored May 01, 2017
  
  35acfb0c
- Merge branch 'rename_symmetric' into 'master' · c9d48415
  Theo Steininger authored Apr 30, 2017
```
Rename property "symmetric" to "self_adjoint"

See merge request !74
```
  c9d48415
- Merge branch 'master' into rename_symmetric · e9ad17fd
  Martin Reinecke authored Apr 30, 2017
  
  e9ad17fd
29 Apr, 2017 1 commit
- Merge branch 'power_test' into 'master' · 3480ab1b
  Theo Steininger authored Apr 29, 2017
```
new branch with power tests

See merge request !73
```
  3480ab1b
28 Apr, 2017 4 commits
- Merge branch 'plotting' of https://gitlab.mpcdf.mpg.de/ift/NIFTy into plotting · 6e832c74
  Mihai Baltac authored Apr 28, 2017
```
# Conflicts:
#	nifty/plotting/__init__.py
#	nifty/plotting/figures/figure_internal.py
#	nifty/plotting/plots/heatmap.py
#	nifty/plotting/plots/private.py
#	nifty/plotting/plots/scatter.py
```
  6e832c74
- cosmetics · ecc43e1b
  Martin Reinecke authored Apr 28, 2017
  
  ecc43e1b
- remove dtype from spaces · 24143e6a
  Martin Reinecke authored Apr 28, 2017
  
  24143e6a
- symmetric->self_adjoint · e10e2759
  Martin Reinecke authored Apr 28, 2017
  
  e10e2759
26 Apr, 2017 3 commits
- try to address hashing/equality problems and fix caches · 93db476d
  Martin Reinecke authored Apr 26, 2017
  
  93db476d
- new branch with power tests · 97b2abdc
  Pumpe, Daniel (dpumpe) authored Apr 26, 2017
  
  97b2abdc
- First steps towards multi power synthesize. · 86b44136
  Theo Steininger authored Apr 26, 2017
  
  86b44136
25 Apr, 2017 2 commits
- Merge branch 'plotting' into 'master' · 7967f2d5
  Theo Steininger authored Apr 25, 2017
```
Plotting

See merge request !70
```
  7967f2d5
- Merge branch 'mmm5' into 'master' · 54885033
  Theo Steininger authored Apr 25, 2017
```
Martin's monster merge part 5/N: final cleanups, fixes and new testcases

See merge request !68
```
  54885033