Update Merit and Fever

Brings a couple of small performance improvements.

Gemfile

@@ -50,8 +50,8 @@ gem 'parallel'
 
 # own gems
 gem 'rubel',         ref: 'e36554a',  github: 'quintel/rubel'
-gem 'quintel_merit', ref: '3faa2ab',  github: 'quintel/merit'
-gem 'fever',         ref: 'e988f2d',  github: 'quintel/fever'
+gem 'quintel_merit', ref: '0f33926',  github: 'quintel/merit'
+gem 'fever',         ref: 'f80677d',  github: 'quintel/fever'
 gem 'turbine-graph', '>=0.1',         require: 'turbine'
 gem 'refinery',      ref: '253158c',  github: 'quintel/refinery'
 gem 'atlas',         ref: '8bdb2c9',  github: 'quintel/atlas'

Gemfile.lock

@@ -17,15 +17,15 @@ GIT
 
 GIT
   remote: https://github.com/quintel/fever.git
-  revision: e988f2ddb81c799a44bdd6582d379d11e67f62b1
-  ref: e988f2d
+  revision: f80677d99dac64a8100bb84e44e6bc30e2b27821
+  ref: f80677d
   specs:
     fever (0.1.0)
 
 GIT
   remote: https://github.com/quintel/merit.git
-  revision: 3faa2ab98e74dac33ce03a0870e26aa625eb654d
-  ref: 3faa2ab
+  revision: 0f33926703c99ae08cd31a09d8484aca908a68d4
+  ref: 0f33926
   specs:
     quintel_merit (0.1.0)
       terminal-table

app/models/qernel/plugins/fever/producer_adapter.rb

@@ -110,7 +110,7 @@ def aliased_adapter
 
       def reserve
         volume  = total_value { @converter.dataset_get(:storage).volume }
-        reserve = ::Merit::Flex::Reserve.new(volume)
+        reserve = ::Merit::Flex::SimpleReserve.new(volume)
 
         # Buffer starts full.
         reserve.add(0, volume)

app/models/qernel/plugins/fever/storage_adapter.rb

@@ -22,7 +22,7 @@ def participant
       private
 
       def reserve
-        ::Merit::Flex::Reserve.new(
+        ::Merit::Flex::SimpleReserve.new(
           total_value { @converter.dataset_get(:storage).volume }
         )
       end

app/models/qernel/plugins/merit/power_to_heat_adapter.rb

@@ -34,8 +34,11 @@ def producer_attributes
         attrs[:excess_share] = excess_share
         attrs[:group] = @config.group
 
-        attrs[:decay] =
-          @converter.number_of_units.zero? ? ->(*) { 0.0 } : reserve_decay
+        if @converter.number_of_units.positive?
+          # Swap back to the slower Reserve which supports decay.
+          attrs[:reserve_class] = ::Merit::Flex::Reserve
+          attrs[:decay] = reserve_decay
+        end
 
         # Do not emit anything; it has been converted to hot water.
         attrs[:output_capacity_per_unit] = 0.0

app/models/qernel/plugins/merit/storage_adapter.rb

@@ -6,6 +6,8 @@ class StorageAdapter < FlexAdapter
       def producer_attributes
         attrs = super
 
+        attrs[:reserve_class] = ::Merit::Flex::SimpleReserve
+
         attrs[:input_capacity_per_unit] =
           @converter.input_capacity ||
           @converter.output_capacity