nom 0.1.2.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7a87ec103978016261d62cf23b12b9e60eb934
-  data.tar.gz: bac40aa74886759b48f5d73619161a446caac995
+  metadata.gz: 7631851ac3b0706686593b269cf49b21d8de8599
+  data.tar.gz: 98c3d3b7f73cb9ee660c33d3e8f60385e6049183
 SHA512:
-  metadata.gz: 998227f0dac4058c6e27f59e26d826f0b60aff73d01307858154387cde2b90e7182ebb516e7a66a475f1c842d7fcdd952ac19172b1ddaff4fdcb9a5da07704a0
-  data.tar.gz: 819cb06d3bcb5eb9f7337f855a60e84508cf2c38105fc74eb97141a5c05f3057c42432d8c35a314b12479a873630d5e69a3f1f599aaf872e2d78df9962a8b23b
+  metadata.gz: 8d485c873e3f738c69be2d4ffa997677062a43c0c083346c5a4ba2655a4230ec2b5524d27f301d0e160add5b18865ea454924b7bb258c41ab6a78fa5e8bd4493
+  data.tar.gz: fb82204147412eace494619adf76e7d447af500baf9567b9182656ac16ddfc5f8590580f4ca94b07bbb2215d4cdc8c3a67966732414c683bda4775b0c882b8e5

data/lib/nom/config.rb

@@ -18,6 +18,7 @@ module Nom
                 "unit" => [ "your desired base unit in kcal", 1, Float ],
                 "start_date" => [ "the first day that should be considered by nom [yyyy-mm-dd]", nil, Date ],
                 "balance_start" => [ "the day from which on nom should keep track of a energy balance [yyyy-mm-dd]", nil, Date ],
+                "balance_factor" => [ "how many money units you'll have to pay per energy unit", 0.01, Float ],
             }
         end
 

data/lib/nom/nom.plt.erb

@@ -31,7 +31,7 @@ plot <%= goal %> t "Goal" lc rgb "forest-green" lw 2, \
 unset obj 1
 
 set yrange [ 0 : <%= quantize((@weights.first..@weights.last).map{|d| [consumed_at(d), allowed_kcal(d, 0), allowed_kcal(d, rate)]}.flatten.max) %> ]
-set ytics 200 nomirror
+set ytics <%= quantize(200) %> nomirror
 set key right bottom
 
 plot "<%= input_dat.path %>" using 1:2:(0):($4-$2) w vectors nohead lc rgb "navy" notitle, \

data/lib/nom/nom.rb

@@ -201,11 +201,13 @@ module Nom
 
         def nom_entry args, date
             summands = args.pop.split("+")
-            kcal = summands.inject(0) do |sum, summand|
+            number = summands.inject(0) do |sum, summand|
                 factors = summand.split("x")
                 sum + factors.map{ |f| f.to_f }.inject(1){ |p,f| p*f }
             end
 
+            kcal = dequantize(number)
+
             if kcal == 0
                 raise "energy term cannot be zero"
             end
@@ -233,8 +235,8 @@ module Nom
             if r.nil?
                 r = @weights.rate_at(date, goal, rate)
             end
-            if date > @weights.last
-                date = @weights.last
+            if date > @weights.last_real
+                date = @weights.last_real
             end
             @base_rate_at[date] + r*1000
         end
@@ -305,7 +307,11 @@ module Nom
         end
 
         def quantize kcal
-            return (1.0*kcal/@config.get("unit")).round
+            (1.0*kcal/@config.get("unit")).round
+        end
+
+        def dequantize number
+            (1.0*number*@config.get("unit")).round
         end
 
         def format_date date
@@ -353,10 +359,15 @@ module Nom
                     remaining -= i.kcal
                 end
                 separator
-                entry(quantize(remaining), "remaining (#{(100-100.0*remaining/allowed_kcal(date)).round}% used)")
+                entry(quantize(remaining), "remaining (#{(100-100.0*quantize(remaining)/quantize(allowed_kcal(date))).round}% used)")
             end
-            if kcal_balance > 0
-                entry(quantize(kcal_balance.abs), "too much since #{balance_start}")
+            if kcal_balance > 0 and @config.has("balance_start")
+                cost = if @config.has("balance_factor")
+                           " (cost: %.2f)" % (@config.get("balance_factor")*quantize(kcal_balance)).round(2)
+                       else
+                           ""
+                       end
+                entry(quantize(kcal_balance), "too much since #{balance_start}#{cost}")
             end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nom
 version: !ruby/object:Gem::Version
-  version: 0.1.2.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sebastian Morr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - gnuplot
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Lose weight and hair through stress and poor nutrition