Commits · 5f3a35b776852df139121f43ec06a9c679b72606 · ift / NIFTy

29 Jun, 2018 4 commits
- resolve conflict · 5f3a35b7
  Jakob Knollmueller authored Jun 29, 2018
  
  5f3a35b7
- Merge branch 'NIFTy_5' into demos · 5aa8a3b6
  Jakob Knollmueller authored Jun 29, 2018
  
  5aa8a3b6
- stuff · 88eaae59
  Jakob Knollmueller authored Jun 29, 2018
  
  88eaae59
- current status · ccd864ba
  Jakob Knollmueller authored Jun 29, 2018
  
  ccd864ba
28 Jun, 2018 24 commits
- Python3 compatibility · 2b5d58fd
  Philipp Arras authored Jun 28, 2018
  
  2b5d58fd
- getting_started_1 cconceptually finished, needs polishing · bf1d9f6e
  Jakob Knollmueller authored Jun 28, 2018
  
  bf1d9f6e
- Merge branch 'model_gradient_test' into 'NIFTy_5' · cb66a789
  Philipp Arras authored Jun 28, 2018
```
Model gradient test

See merge request ift/nifty-dev!10
```
  cb66a789
- Merge branch 'tweak_energy_sum' into 'NIFTy_5' · be351767
  Philipp Arras authored Jun 28, 2018
```
improve implementation of EnergySum and allow for linear combination of energies

See merge request ift/nifty-dev!15
```
  be351767
- Cosmetics · 6b9d5cb4
  Philipp Arras authored Jun 28, 2018
  
  6b9d5cb4
- unit tests · 8d1d3793
  Martin Reinecke authored Jun 28, 2018
  
  8d1d3793
- tweak · 8e4d6329
  Martin Reinecke authored Jun 28, 2018
  
  8e4d6329
- allow subtraction and negation as well · d9e254cd
  Martin Reinecke authored Jun 28, 2018
  
  d9e254cd
- improve implementation of EnergySum and allow for linear combination of energies · bae4a32b
  Martin Reinecke authored Jun 28, 2018
  
  bae4a32b
- sneaking in a little change such that the tolerance is independant of the dimension · 4855ce88
  Reimar H Leike authored Jun 28, 2018
  
  4855ce88
- Add comments · ab8fc3d0
  Natalia Porqueres authored Jun 28, 2018
  
  ab8fc3d0
- now using realtive error and cleaned code · a2c29670
  Reimar H Leike authored Jun 28, 2018
  
  a2c29670
- eliminated 2 TODOs · 35a44a2e
  Reimar H Leike authored Jun 28, 2018
  
  35a44a2e
- Cosmetics · 5dbc6d90
  Philipp Arras authored Jun 27, 2018 and Reimar H Leike committed Jun 28, 2018
  
  5dbc6d90
- changed __init__.py accordingly · e5803345
  Reimar H Leike authored Jun 27, 2018
  
  e5803345
- value-gradient consistency check now also works with models, added a test that... · 1d25e062
  Reimar H Leike authored Jun 27, 2018
```
value-gradient consistency check now also works with models, added a test that uses this as a test for the test
```
  1d25e062
- Add Poisson demo · a9e95d30
  Natalia Porqueres authored Jun 28, 2018
  
  a9e95d30
- Merge branch 'demos' into 'NIFTy_5' · ae802b86
  Philipp Arras authored Jun 28, 2018
```
new demos

See merge request ift/nifty-dev!11
```
  ae802b86
- Merge branch 'NIFTy_5' into demos · e288370f
  Philipp Arras authored Jun 28, 2018
  
  e288370f
- Clear up CI and use python3 for jupyter notebook · 6a5e113f
  Philipp Arras authored Jun 28, 2018
  
  6a5e113f
- Merge branch 'new_energies' into 'NIFTy_5' · b6c358a0
  Philipp Arras authored Jun 28, 2018
```
New energies

See merge request ift/nifty-dev!2
```
  b6c358a0
- Fix kl dependencies · e4337b58
  Philipp Arras authored Jun 28, 2018
  
  e4337b58
- Move Hamiltonian to energies · 22cf99a8
  Philipp Arras authored Jun 28, 2018
  
  22cf99a8
- merge · ed1c00ff
  Martin Reinecke authored Jun 28, 2018
  
  ed1c00ff
27 Jun, 2018 12 commits
- Merge branch 'revert_casting' into 'NIFTy_5' · a1485b1c
  Philipp Arras authored Jun 27, 2018
```
Revert change in amplitude model

See merge request ift/nifty-dev!13
```
  a1485b1c
- Revert change in amplitude model · 00e5367f
  Philipp Arras authored Jun 27, 2018
  
  00e5367f
- Merge branch '21-revert-automatical-casting-of-field-to-model' into 'NIFTy_5' · 4a893224
  Philipp Arras authored Jun 27, 2018
```
Resolve "Revert automatical casting of Field to model"

Closes #21

See merge request ift/nifty-dev!12
```
  4a893224
- Revert casting of Field to Model · 54aa8414
  Philipp Arras authored Jun 27, 2018
  
  54aa8414
- Merge branch 'migrate_from_gn' into 'NIFTy_5' · e53f2d33
  Philipp Arras authored Jun 27, 2018
```
Migrate from gn

See merge request ift/nifty-dev!3
```
  e53f2d33
- Fixup · bb223a89
  Philipp Arras authored Jun 27, 2018
  
  bb223a89
- Change order of tests · e25aecb6
  Philipp Arras authored Jun 27, 2018
  
  e25aecb6
- Fixups · d10f7a5a
  Philipp Arras authored Jun 27, 2018
  
  d10f7a5a
- Merge branch 'wiener_filter_curvature_potential_bug' into 'NIFTy_5' · 52e8355f
  Martin Reinecke authored Jun 27, 2018
```
Fixing (?) `wiener_filter_curvature`: condition on wrong iteration controller

See merge request ift/nifty-dev!4
```
  52e8355f
- fixing (?) WF curvature: condition on wrong iteration controller · 9c9317a9
  Lukas Platz authored Jun 27, 2018
  
  9c9317a9
- Fixup · 357e20ac
  Philipp Arras authored Jun 27, 2018
  
  357e20ac
- Fixups · 5ed64170
  Philipp Arras authored Jun 27, 2018
  
  5ed64170