From abd7d02b895ce6b672c4b8c4310de91fb2d73a2f Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sun, 10 May 2020 21:55:12 +0200 Subject: [PATCH] Added QuantityInput class --- app/models/formula.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/formula.rb b/app/models/formula.rb index ccd9278..01d9a75 100644 --- a/app/models/formula.rb +++ b/app/models/formula.rb @@ -20,7 +20,7 @@ class Formula < ActiveRecord::Base def calculate(inputs) raise(InvalidInputs, 'No inputs') if inputs.empty? - deps = inputs.map { |q, v| [q.name, v.transpose[0]] }.to_h + deps = inputs.map { |q, v| [q.name, v.transpose.first] }.to_h length = deps.values.first.length raise(InvalidFormula, 'Invalid formula') unless self.valid? @@ -42,6 +42,13 @@ class Formula < ActiveRecord::Base private + class QuantityInput < Array + def initialize(q, *args) + super(*args) + @quantity = q + end + end + def parse d_methods = ['abs', 'nil?'] q_methods = Hash.new(['all', 'lastBefore'])