forgetful 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/forgetful/csv_ext/reminder.rb

@@ -26,10 +26,10 @@ class Reminder
     converters = [lambda { |question| question },
                   lambda { |answer|   answer },
                   lambda { |due_on|   Date.parse(due_on) },
-                  lambda { |history|  history.scan(/./).collect { |x| x.to_i } }]
+                  lambda { |history|  history.scan(/./).map { |x| x.to_i } }]
 
-    CSV.parse(io, :skip_blanks => true).collect do |list|
-      list = list.zip(converters).collect { |col, converter| converter[col] }
+    CSV.parse(io, :skip_blanks => true).map do |list|
+      list = list.zip(converters).map { |col, converter| converter[col] }
       new(*list)
     end
   end

data/lib/forgetful/reminder.rb

@@ -9,7 +9,8 @@ class Reminder
   end
 
   def next(q)
-    Reminder.new(question, answer, SuperMemo::next_date(Date.today, history + [q]), history + [q])
+    new_history = history + [q]
+    Reminder.new(question, answer, SuperMemo::next_date(Date.today, new_history), new_history)
   end
 
   def to_a

data/lib/forgetful/supermemo.rb

@@ -1,14 +1,30 @@
 module SuperMemo
+  # D_EF[q] = (0.1 - (5-q) * (0.08 + (5-q) * 0.02))
+  D_EF = { 0 => -0.8,
+           1 => -0.54,
+           2 => -0.32,
+           3 => -0.14,
+           4 =>  0,
+           5 =>  0.1 }
+
   def self.next_ef(q, ef)
-    return [ef + (0.1 - (5-q) * (0.08 + (5-q) * 0.02)), 1.3].max
+    [ef + D_EF[q], 1.3].max
   end
 
   def self.next_i(q, i)
-    return q < 3 ? 0 : i+1
+    return 0 if q < 3
+
+    i+1
   end
 
   def self.next_interval(q, ef, i, interval)
-    return q < 3 ? 1 : {0 => 1, 1 => 6}.fetch(i, interval * ef).round
+    return 1 if q < 3
+
+    case i
+    when 0 then 1
+    when 1 then 6
+    else        (interval * ef).round
+    end
   end
 
   #      [] -> 2.5, 0, 0
@@ -17,11 +33,11 @@ module SuperMemo
     return [ef, i, interval] if qs.empty?
 
     q = qs.first
-    return traverse(qs[1..-1], next_ef(q, ef), next_i(q, i), next_interval(q, ef, i, interval))
+    traverse(qs[1..-1], next_ef(q, ef), next_i(q, i), next_interval(q, ef, i, interval))
   end
 
   def self.next_date(date, qs)
     ef, i, interval = traverse(qs)
-    return date + interval
+    date + interval
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jonathan Palardy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 -04:00
+date: 2010-05-27 00:00:00 -04:00
 default_executable: forgetful
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A minimal command-line implementation of the SuperMemo 2 algorithm.