Commits · 50beeb9719d4f3a5bc8287ff337b6b444e865044 · ift / NIFTy

17 May, 2017 3 commits
- Merge branch 'master' into 'docstrings_energy_minimization' · 50beeb97
  Theo Steininger authored May 17, 2017
```
Master

See merge request !131
```
  50beeb97
- Removed FieldType.process · 26dcdd26
  Theo Steininger authored May 17, 2017
  
  26dcdd26
- Bugfix in Energy · afafb3a0
  Theo Steininger authored May 17, 2017
  
  afafb3a0
16 May, 2017 19 commits
- Included a warning if nbin is set to higher value than length of kindex. · 046142bf
  Theo Steininger authored May 16, 2017
  
  046142bf
- Merge branch 'h5py_via_pip' into 'master' · fcb7e1f9
  Theo Steininger authored May 16, 2017
```
Changed h5py install script to pip.

See merge request !126
```
  fcb7e1f9
- Changed h5py install script to pip. · 322b5c8a
  Theo Steininger authored May 16, 2017
  
  322b5c8a
- Merge branch 'docstring_operators' into 'master' · 0f453ce6
  Theo Steininger authored May 16, 2017
```
Merge branch 'master' into 'docstring_operators'

See merge request !116
```
  0f453ce6
- Merge branch 'Real-Field_Synthesizer' into 'master' · 444c0c2d
  Theo Steininger authored May 16, 2017
```
Real field synthesizer

See merge request !125
```
  444c0c2d
- Merge branch 'minor_changes' into 'master' · b15cc6fa
  Theo Steininger authored May 16, 2017
```
Minor changes in Field class

See merge request !124
```
  b15cc6fa
- Merge branch 'misc_fixes' into 'master' · 0ad045c1
  Theo Steininger authored May 16, 2017
```
Misc fixes

See merge request !123
```
  0ad045c1
- tweak installation instructions · d086870e
  Martin Reinecke authored May 16, 2017
  
  d086870e
- update of old keyword harmonic_domain to harmonic_partner · 9dcec5bc
  Pumpe, Daniel (dpumpe) authored May 16, 2017
  
  9dcec5bc
- Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy · 9c0dde2d
  Pumpe, Daniel (dpumpe) authored May 16, 2017
  
  9c0dde2d
- try to improve serialization test · 97bd408b
  Martin Reinecke authored May 16, 2017
  
  97bd408b
- try to improve serialization test · 13b14bf5
  Martin Reinecke authored May 16, 2017
  
  13b14bf5
- test CI · d330fcc4
  Martin Reinecke authored May 16, 2017
  
  d330fcc4
- remove spurious file · dcf8a19c
  Martin Reinecke authored May 16, 2017
  
  dcf8a19c
- fix issue 125 by installing cython again · f35278d7
  Martin Reinecke authored May 16, 2017
  
  f35278d7
- Fixed test for LMSpace. · f222436d
  Theo Steininger authored May 16, 2017
  
  f222436d
- Fixed test for LMSpace · 90748960
  Theo Steininger authored May 16, 2017
  
  90748960
- Fixed tests for hermitianization. · 141a2d12
  Theo Steininger authored May 16, 2017
  
  141a2d12
- Added methods for real-valued signal field synthetization on product spaces. · 32660276
  Theo Steininger authored May 16, 2017
  
  32660276
15 May, 2017 18 commits
- Merge branch 'field_docu' into 'master' · 76133243
  Theo Steininger authored May 16, 2017
```
Some docstring refactoring.

See merge request !122
```
  76133243
- Some docstring refactoring. · acb6e550
  Theo Steininger authored May 16, 2017
  
  acb6e550
- Merge branch 'fixed_PowerSpace_h5py' into 'master' · 65261230
  Theo Steininger authored May 15, 2017
```
Fixed power space h5py

See merge request !121
```
  65261230
- Fixed _to_hdf5 and _from_hdf5 in PowerSpace · 6b0bebb9
  Theo Steininger authored May 15, 2017
  
  6b0bebb9
- Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy · cdc0d6ab
  Theo Steininger authored May 15, 2017
  
  cdc0d6ab
- Switched back to Freds pyfftw branch. · abde34d7
  Theo Steininger authored May 15, 2017
  
  abde34d7
- small update · 5b259cc2
  Theo Steininger authored May 15, 2017
  
  5b259cc2
- Merge branch 'improve_readme' into 'master' · a3e82504
  Theo Steininger authored May 15, 2017
```
Improve README.md

See merge request !89
```
  a3e82504
- Merge branch 'master' into 'improve_readme' · 3dc7b0f5
  Theo Steininger authored May 15, 2017
```
# Conflicts:
#   README.md
```
  3dc7b0f5
- Merge branch 'docstring_operators' into docstrings_energy_minimization · e4bfff38
  Theo Steininger authored May 15, 2017
```
# Conflicts:
#	nifty/minimization/conjugate_gradient.py
#	nifty/minimization/descent_minimizer.py
#	nifty/minimization/relaxed_newton.py
#	nifty/minimization/steepest_descent.py
#	nifty/minimization/vl_bfgs.py
```
  e4bfff38
- Merge branch 'field_docu' into docstring_operators · b81eb80e
  Theo Steininger authored May 15, 2017
  
  b81eb80e
- Merge branch 'master' into field_docu · 223f71e3
  Theo Steininger authored May 15, 2017
  
  223f71e3
- Removed Makefile & PKG-INFO · 23cbce7a
  Theo Steininger authored May 15, 2017
  
  23cbce7a
- Merge branch 'byebye_cython' into 'master' · aeb7415c
  Theo Steininger authored May 15, 2017
```
Replace direct smoothing code by pure Python

See merge request !96
```
  aeb7415c
- Merge branch 'master' into improve_readme · e77963eb
  Martin Reinecke authored May 15, 2017
  
  e77963eb
- merge master · 260b19e1
  Martin Reinecke authored May 15, 2017
  
  260b19e1
- Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy · 6e2802da
  Pumpe, Daniel (dpumpe) authored May 15, 2017
  
  6e2802da
- Update response_operator.py according to Martins hints and insights · 7b445aed
  Pumpe, Daniel (dpumpe) authored May 15, 2017
  
  7b445aed