Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Commented nutrient computation algo

Browse Source
This commit is contained in:
cryptogopher 2019-11-07 00:43:30 +01:00
parent 8bad0b0b0f
commit c1771d44d7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/ingredient.rb
View File

@ -53,17 +53,20 @@ class Ingredient < ActiveRecord::Base
while !unchecked_q.empty? while !unchecked_q.empty?
q, deps = unchecked_q.shift q, deps = unchecked_q.shift
# quantity not computable (no formula) or not requiring calculation/computed
if q.formula.blank? || (nutrients[q.name].length == ingredients.count) if q.formula.blank? || (nutrients[q.name].length == ingredients.count)
completed_q[q.name] = nutrients.delete(q.name) || {} completed_q[q.name] = nutrients.delete(q.name) || {}
next next
end end
# quantity with formula requires refresh of dependencies availability
if deps.nil? || !deps.empty? if deps.nil? || !deps.empty?
deps ||= q.formula_quantities deps ||= q.formula_quantities
deps.reject! { |q| completed_q.has_key?(q.name) } deps.reject! { |q| completed_q.has_key?(q.name) }
deps.each { |q| unchecked_q << [q, nil] unless unchecked_q.index { |u| u[0] == q } } deps.each { |q| unchecked_q << [q, nil] unless unchecked_q.index { |u| u[0] == q } }
end end
# quantity with formula has all dependencies satisfied, requires calculation
if deps.empty? if deps.empty?
input_q = q.formula_quantities input_q = q.formula_quantities
inputs = ingredients.select { |i| nutrients[q.name][i.id].nil? }.map do |i| inputs = ingredients.select { |i| nutrients[q.name][i.id].nil? }.map do |i|
@ -79,9 +82,11 @@ class Ingredient < ActiveRecord::Base
end end
q.calculate(inputs).each { |i, result| nutrients[q.name][i.id] = result } q.calculate(inputs).each { |i, result| nutrients[q.name][i.id] = result }
unchecked_q.unshift([q, deps]) unchecked_q.unshift([q, deps])
else next
unchecked_q << [q, deps]
end end
# quantity still has unsatisfied dependencies, move to the end of queue
unchecked_q << [q, deps]
end end
all_q = nutrients.merge(completed_q) all_q = nutrients.merge(completed_q)