Use Merits CurveTools to sum Fever production curves

Closes #1389
quintel · Feb 15, 2024 · daccc0a · daccc0a
1 parent 40788b8
commit daccc0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/qernel/fever_facade/consumer_adapter/calculable_activity.rb b/app/models/qernel/fever_facade/consumer_adapter/calculable_activity.rb
@@ -44,7 +44,9 @@ def demand_curve_from_activities
         def production_curve_from_activities
           Merit::CurveTools.add_curves(
             calculable_activities.filter_map do |_, activity|
-              activity.activities.sum(&:production_curve) unless activity.empty?
+              unless activity.empty?
+                Merit::CurveTools.add_curves(activity.activities.map(&:production_curve))
+              end
             end
           ) || EMPTY_CURVE
         end

diff --git a/app/models/qernel/fever_facade/producer_adapter/inject.rb b/app/models/qernel/fever_facade/producer_adapter/inject.rb
@@ -49,6 +49,10 @@ def inject_aggregator_attributes!(production)
 
           # TODO: should be a method on collection of participants
           demand = participants.sum(&:demand)
+          # puts @node.key
+          # puts demand
+          # puts production
+          # debugger if @node.key == :buildings_space_heater_heatpump_air_water_network_gas
           edge   = conv.output(:useable_heat).edges.first
 
           edge.share = demand.positive? ? production / demand : 0.0