Commits · 570a1ddd81d56ae7211524d529ef21cfc7afe1fb · ift / NIFTy

21 Jul, 2017 2 commits
- revert a few temporary changes · 570a1ddd
  Martin Reinecke authored Jul 21, 2017
  
  570a1ddd
- Merge branch 'master' into line_search · 4f0c5156
  Martin Reinecke authored Jul 21, 2017
  
  4f0c5156
20 Jul, 2017 3 commits
- Merge branch 'byebye_fixed_point_voodoo' into 'master' · b8bd4934
  Theo Steininger authored Jul 21, 2017
```
Byebye fixed point voodoo

See merge request !173
```
  b8bd4934
- LineEnergy now again inherits from object · fe2c9d98
  Theo Steininger authored Jul 21, 2017
  
  fe2c9d98
- plotting now produces semi-reasonable results · db23017b
  Theo Steininger authored Jul 20, 2017
  
  db23017b
19 Jul, 2017 7 commits
- merge from master · 0dcb85ee
  Martin Reinecke authored Jul 19, 2017
  
  0dcb85ee
- re-introduce higher-order interpolation · 5ee3f23d
  Martin Reinecke authored Jul 19, 2017
  
  5ee3f23d
- more descriptive interface for LineEnergy · 6e71f1e8
  Martin Reinecke authored Jul 19, 2017
  
  6e71f1e8
- Added logarithmic to CriticalPowerEnergy.at · d11f0851
  Theo Steininger authored Jul 19, 2017
  
  d11f0851
- Merge branch 'master' into line_search · 12a5a3ac
  Martin Reinecke authored Jul 19, 2017
  
  12a5a3ac
- re-add some code in commented form · cbdbca99
  Martin Reinecke authored Jul 19, 2017
  
  cbdbca99
- Merge branch 'master' into byebye_fixed_point_voodoo · f23c4d72
  Martin Reinecke authored Jul 19, 2017
  
  f23c4d72
18 Jul, 2017 6 commits
- distribution_strategy can now be chosen explicitly in power_synthesize. · 1d10be46
  Theo Steininger authored Jul 18, 2017
  
  1d10be46
- Added `distribution_strategy=x.distribution_strategy` to default fields in InvertibleOperatorMixin · 3030e93d
  Theo Steininger authored Jul 18, 2017
  
  3030e93d
- Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy · e1e13bd9
  Theo Steininger authored Jul 18, 2017
  
  e1e13bd9
- Added a check and modified tests for 1D mpi-ffts to deal with issues in FFTW: · 38cda656
  Theo Steininger authored Jul 18, 2017
```
https://github.com/fredRos/pyFFTW/issues/8
https://github.com/fredRos/pyFFTW/issues/9
```
  38cda656
- Merge branch 'Branch_master' into 'master' · e95a573a
  Theo Steininger authored Jul 18, 2017
```
Added dtype option to prober.

See merge request !169
```
  e95a573a
- Added dtype option to prober. · b81cb205
  Theo Steininger authored Jul 18, 2017
  
  b81cb205
17 Jul, 2017 3 commits
- Merge branch 'revert-03cc7f7e' into 'master' · 3a1a4975
  Jakob Knollmueller authored Jul 17, 2017
```
Revert "added some distribution_strategy's for mpirun, fixed some errors in WienerFilterEnergy"

See merge request !167
```
  3a1a4975
- Revert "added some distribution_strategy's for mpirun, fixed some errors in WienerFilterEnergy" · ef214849
  Jakob Knollmueller authored Jul 17, 2017
```
This reverts commit 03cc7f7e
```
  ef214849
- added some distribution_strategy's for mpirun, fixed some errors in WienerFilterEnergy · 03cc7f7e
  Jakob Knollmueller authored Jul 17, 2017
  
  03cc7f7e
16 Jul, 2017 2 commits
- Merge branch 'master' into line_search · 70ef764a
  Martin Reinecke authored Jul 16, 2017
  
  70ef764a
- Merge branch 'line_search' of gitlab.mpcdf.mpg.de:ift/NIFTy into line_search · 7b98c3bb
  Martin Reinecke authored Jul 16, 2017
  
  7b98c3bb
15 Jul, 2017 1 commit
- PEP8 changes · 41309d1f
  Philipp Arras authored Jul 16, 2017
  
  41309d1f
14 Jul, 2017 14 commits
- temporary · b5f2473f
  Martin Reinecke authored Jul 14, 2017
  
  b5f2473f
- new stopping criterion · d27bca16
  Martin Reinecke authored Jul 14, 2017
  
  d27bca16
- clarifications and cosmetics · 4ee9b94a
  Martin Reinecke authored Jul 14, 2017
  
  4ee9b94a
- cleanup · e8c237d2
  Martin Reinecke authored Jul 14, 2017
  
  e8c237d2
- Merge branch 'avoid_exec' into 'master' · 67a98fe9
  Theo Steininger authored Jul 14, 2017
```
avoid exec statements; they cause problems with Python 3

See merge request !165
```
  67a98fe9
- more tweaks · 20f956d8
  Martin Reinecke authored Jul 14, 2017
  
  20f956d8
- test serialization of Fields · ebcc660c
  Martin Reinecke authored Jul 14, 2017
  
  ebcc660c
- avoid exec statements; they cause problems with Python 3 · 5596655d
  Martin Reinecke authored Jul 14, 2017
  
  5596655d
- cosmetics · 1ffad5a8
  Martin Reinecke authored Jul 14, 2017
  
  1ffad5a8
- Merge branch 'master' into line_search · 3261278a
  Martin Reinecke authored Jul 14, 2017
  
  3261278a
- intermediate stage · c754769f
  Martin Reinecke authored Jul 14, 2017
  
  c754769f
- Merge branch 'Branch_master' into 'master' · dd87b630
  Theo Steininger authored Jul 14, 2017
```
Branch master

See merge request !164
```
  dd87b630
- Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy · e7db670d
  Theo Steininger authored Jul 14, 2017
```
# Conflicts:
#	nifty/spaces/lm_space/lm_space.py
```
  e7db670d
- Fixed bug in LMSpace.get_distance_array and HealpixPlotter. Worked on demos. · b8218064
  Theo Steininger authored Jul 14, 2017
  
  b8218064
13 Jul, 2017 2 commits
- Merge branch 'master' into line_search · 67950f71
  Martin Reinecke authored Jul 13, 2017
  
  67950f71
- remove fixed point magic · 1ce8d473
  Martin Reinecke authored Jul 13, 2017
  
  1ce8d473