From 320fe9338843f59a7167c2a0dc365e267f278c8f Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Tue, 10 Mar 2020 22:17:20 +0100 Subject: [PATCH] Fixed references to formula as model --- lib/body_tracking/items_with_quantities.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/body_tracking/items_with_quantities.rb b/lib/body_tracking/items_with_quantities.rb index 48966c3..c618707 100644 --- a/lib/body_tracking/items_with_quantities.rb +++ b/lib/body_tracking/items_with_quantities.rb @@ -67,7 +67,7 @@ module BodyTracking q, deps = unchecked_q.shift # quantity not computable (no formula) or not requiring calculation/computed - if !q.formula? || !q.formula_valid? || (subitems[q.name].length == items.count) + if !q.formula || !q.formula.valid? || (subitems[q.name].length == items.count) completed_q[q.name] = subitems.delete(q.name) { {} } completed_q[q.name].default = [nil, nil] next @@ -75,7 +75,7 @@ module BodyTracking # quantity with formula requires refresh of dependencies availability if deps.nil? || !deps.empty? - deps ||= q.formula_quantities + deps ||= q.formula.quantities deps.reject! { |q| completed_q.has_key?(q.name) } deps.each { |q| unchecked_q << [q, nil] unless unchecked_q.index { |u| u[0] == q } } end @@ -83,9 +83,9 @@ module BodyTracking # quantity with formula has all dependencies satisfied, requires calculation if deps.empty? output_ids = items.select { |i| subitems[q.name][i.id].nil? }.map(&:id) - input_q = q.formula_quantities + input_q = q.formula.quantities inputs = input_q.map { |i_q| [i_q, completed_q[i_q.name].values_at(*output_ids)] } - q.formula_calculate(inputs.to_h).each_with_index do |result, index| + q.formula.calculate(inputs.to_h).each_with_index do |result, index| subitems[q.name][output_ids[index]] = result end unchecked_q.unshift([q, deps])