nutrition with weighted average
description of configurations
description of configuration
nutritionCalculation
Bugfix Merge
Merge branch 'features/research-shortterm' into features/research-recommender-shortterm
Set values in EnergyCalcConf
NPE Shortterm Config
Utils
GA
Merge branch 'features/research-recommender-shortterm' of https://github.com/spektrumprojekt/spektrum into features/research-recommender-shortterm
CQ
Merge branch 'features/research-recommender-shortterm' of github.com:spektrumprojekt/spektrum into features/research-recommender-shortterm
Merge branch 'features/research-recommender-shortterm' into release-0.3