dates 1.0.2 → 1.0.4

data/README.mdown

@@ -21,6 +21,30 @@ To run it, the simplest way is just to provide it with an ideas file and nothing
     $ dates ideas.rb
     watch _serenity_: (intellectual: 5, athletic: 0, adventure: 2, romantic: 4)
 
+### Ideas
+
+Dates need an ideas file to work.  An ideas file looks like this:
+
+    DateIdeas.new do
+
+      date "watch _movie title_" do
+        kind :adventure => 2, :romantic => 4, :intellectual => 6, :athletic => 0
+        requires :weather => 0, :hours => 2
+        outcome 6
+      end
+
+      date "read a book" do
+        kind :romantic => 3, :adventure => 6, :athletic => 3, :intellectual => 5
+        requires :weather => 5, :hours => 2
+      end
+
+      date "go adventuring" do
+        kind :adventure => 5, :romantic => 7, :intellectual => 5, :athletic => 1
+        requires :weather => 8, :hours => 3
+      end
+
+    end
+
 ### Commands
 
 The `choose` command picks a date, and it takes two options:

data/bin/dates

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../lib/dates'
 
 SUB_COMMANDS = %w(list choose)
-VERSION_STR = "dates 1.0.0-beta, max & daphne."
+VERSION_STR = "dates #{Dates::VERSION}-beta, max & daphne."
 global_opts = Trollop::options do
   version VERSION_STR
   banner <<-EOS

data/lib/date_ideas.rb

@@ -42,7 +42,7 @@ class DateIdeas
       elsif f.complete? and f.score < 6.0
         str << "  #{f.to_s}".red
       else
-        raise Exception("We should never reach this.")
+        raise "We should never reach this."
       end
     end
     str
@@ -60,10 +60,12 @@ class DateIdeas
     @date_ideas.reject { |idea| idea.stub? or idea.complete? }
   end
 
-  def extract_features(idea_list)
-    keys = idea_list.reduce([]) { |acc, idea|
-      acc << idea.attributes.keys
-    }.flatten.uniq
+  def extract_features(idea_list, keys = [])
+    if keys.empty?
+      keys = idea_list.reduce([]) { |acc, idea|
+        acc << idea.attributes.keys
+      }.flatten.uniq
+    end
     features = idea_list.map { |idea|
       attributes = idea.attributes.map { |key, val|
         [keys.index(key), val]
@@ -73,24 +75,55 @@ class DateIdeas
     [keys, features]
   end
 
-  def fitted_model
-    dimensions, examples = complete_features
-    terms = examples.map { |examples|
-      examples[0] + examples[0].permutation(2).to_a.map { |term| term.reduce(1) {|acc,k| acc*k } }
+  def fitted_model(keys = [])
+    dimensions, examples = complete_features(keys)
+    # need regularization (elastic net?) before adding these terms
+    #terms = Matrix.rows examples.map { |example|
+    #  example[0] + example[0].permutation(2).to_a.map { |term| term.reduce(1) {|acc,k| acc*k } }
+    #}
+    terms = Matrix.rows examples.map { |example| example[0] }
+    outcomes = Matrix.column_vector(examples.map { |example| example[1] })
+    if (terms.t * terms).det == 0
+      raise "The determinant is zero.  There's likely no useful information here."
+    end
+    betas = ((terms.t * terms).inv * terms.t * outcomes).t.to_a.flatten.map { |e|
+      e.to_f.round(4)
+    }
+    [keys, betas]
+  end
+
+  def estimate_outcomes(model = nil)
+    if model.nil?
+      keys, betas = fitted_model
+    else
+      keys, betas = model
+    end
+    keys, features = incomplete_features(keys)
+    features.map { |idea|
+      val = 0
+      idea[0].each_with_index { |attribute, i|
+        val += betas[i] * attribute
+      }
+      val
     }
   end
 
-  def complete_features
-    extract_features(complete)
+  def complete_features(keys = [])
+    extract_features(complete, keys)
   end
 
-  def incomplete_features
-    extract_features(incomplete)
+  def incomplete_features(keys = [])
+    extract_features(incomplete, keys)
   end
 
   def choose(weather, time)
-    fitted_model
-    incomplete.first
+    keys, betas = fitted_model
+    jitter = betas.inject{|sum,x| sum + x }
+    outcomes = estimate_outcomes([keys, betas]).each_with_index.map {|k,i|
+      [k,i]
+    }.sort_by {|k| -k[0] + rand(jitter)}
+    best = outcomes.first[1]
+    incomplete[best]
   end
 
 end

data/lib/dates.rb

@@ -5,5 +5,7 @@ require 'statsample'
 require 'trollop'
 require 'date_ideas'
 require 'date_idea'
+require 'mathn'
+require 'version'
 
 $LOAD_PATH.shift

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dates
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dates
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsample
-  requirement: &70210141108340 !ruby/object:Gem::Requirement
+  requirement: &70180995201540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210141108340
+  version_requirements: *70180995201540
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70210141103020 !ruby/object:Gem::Requirement
+  requirement: &70180995201020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210141103020
+  version_requirements: *70180995201020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70210141102340 !ruby/object:Gem::Requirement
+  requirement: &70180995200600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210141102340
+  version_requirements: *70180995200600
 description: Dates keeps track of things you two have been meaning to do, and learns
   to make good suggestions as you teach it.
 email: maxhodak@gmail.com