statfeed 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c60df28cfbe507a544ecbdd58cd0c24f1d8ac87
-  data.tar.gz: 81da8653f2970b5295fd2c84410725e9fc4e86a9
+  metadata.gz: 9c6c540c16236c35e45d7f0b20f1ec84d4d2c624
+  data.tar.gz: 77ab3b7498230d2c6bed53d4bd3e5a5173e32ac4
 SHA512:
-  metadata.gz: 2411be809e795c59c8d6f9208449d03af3f756a7ed72d508852d21c2d250789a13c01734f485c6a31758bfdf0af1acc76137846a8c653bf8ab294764ceda9d84
-  data.tar.gz: cd055760f586d4f00734623e32adbe2d3987c8ff4eda5e2ec26b92c4de2121b90236430a6ef838287c958bf7ffd68610812b2e5f29472f7c23ee0211e4a5adc6
+  metadata.gz: 350b2dfe60dd2801cbee43b6aed20e5d8a2161478465797bcadabfcf182c4a0a3737e416d9859f77676164d12efc4c77a9fccdf3a77f7ec0e1aae1cef572ef77
+  data.tar.gz: 762e4da1cfc1305d3b66e514efa831cb393a989d3245812bb3e0cf27cdadf5076a67d02444c05519f8ce66c626639a44caac45cce2b2915f2f903dcfb2a3f022

data/lib/statfeed.rb

@@ -1,5 +1,5 @@
 class Statfeed
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
   attr_accessor :weights, :choices, :randoms, :heterogeneities, :accents, :statistics, :size, :decisions, :options
  
   def initialize decisions, options, heterogeneity: 0.1, accent: 1.0
@@ -27,13 +27,20 @@ class Statfeed
   end
 
   def populate_choices
-    @decisions.each_index do |decision|
-      vals = scheduling_values(decision)
-      @choices[decision] = sort_options(vals).first
-      increment_statistics decision, sort_option_indices(vals).first
-      normalize_statistics! decision
+    @choices.tap do |choices|
+      @decisions.each_index do |decision|
+        options = sort_options(scheduling_values(decision))
+        index = options.find_index {|o| acceptable? o}
+        choices[decision] = options[index]
+        increment_statistics decision, index
+        normalize_statistics! decision
+      end
     end
-    @choices
+  end
+
+  # Default is "everything's okay"
+  def acceptable? o
+    true
   end
 
   def populate_randoms

data/test/test_statfeed.rb

@@ -27,32 +27,19 @@ class TestStatfeed < Minitest::Test
     assert_each_equal %w(a c b), actual
   end
 
-  def test_n_decisions
-    # Should have N possible decisions
+  def test_populate_choices
+    actual = @sf.populate_choices
+    assert_each_equal %w(a b b), actual
   end
 
-  def test_m_options
-    # Should have a common pool of M possible options
-  end
-
-  def test_s_sub_m
-    # Should have a statistic S_m for the statistic associated with option m
-  end
-
-  def test_a_sub_n
-    # Accent (stress) associated with the decision n
-  end
-
-  def test_h_sub_n
-    # Heterogeneity associated with decision n
-  end
-
-  def test_w_sub_m_n
-    # Weight associated with option m during decision n
-  end
+  def test_additional_constraints
+    # Define a new method excluding the a
+    def @sf.acceptable? o
+      o != 'a'
+    end
 
-  def test_u_sub_m_n
-    # Uniformly distributed random number for each option of each decision
+    actual = @sf.populate_choices
+    assert_each_equal %w(b c c), actual
   end
 
   def assert_each_in_delta exp, act, delta = 0.001

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statfeed
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc