planout 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6ac7ac834d56d050fdc5d7a354f963e7fbef99
-  data.tar.gz: 5a28a98c04bf3560be6d2ce89662f083ed249ba5
+  metadata.gz: b0ceb7515e0ea00593e38d727421d25b9a8309f6
+  data.tar.gz: 1ed211f8d2caf59c732165cfa83b9a1fd38eaa21
 SHA512:
-  metadata.gz: 41b8aac76573def514e18e6676af436340f9f86a7e9cfb2c7295c46e8a10620a8ed53ffed8b883503de7eb84d391d96917cb437145bc4351e185da56d015a1df
-  data.tar.gz: c2b98270f2d422568adc7d12b3c6fad917a36c0ef744a3aa7312fa2c71acc0a1c6ee006a2cc33d8bfdbd510d6ff52d0891186cd0e7a8ed0fb9163b4d3738d870
+  metadata.gz: 790a6c990f7cee32972682b3ad9ea7dc305211ec4080b3952e5d91b2f4481f387b9a5a50e06e5207cad4f82db646bc739483b6102c76a1713f355a8d3ad5f30a
+  data.tar.gz: 3516ce0449d787b7deaf66e15faae2631ca0856f6f346e3293be30bb45f07759b3d4deced2c9e5a4daf3d3658560b1584afc71a75a8a46b1f47ed0a9a3d4f4b4

data/lib/plan_out/op_random.rb

@@ -57,18 +57,19 @@ module PlanOut
 
       return [] if choices.length() == 0
 
-      cum_weights = choices.zip(weights)
+      cum_weights = Array.new(weights.length)
       cum_sum = 0.0
 
-      cum_weights.each do |choice, weight|
+      weights.each_with_index do |weight, index|
         cum_sum += weight
-        cum_weights[choice] = cum_sum
+        cum_weights[index] = cum_sum
       end
 
       stop_value = get_uniform(0.0, cum_sum)
 
-      cum_weights.each do |choice, cum_weight|
-        choice if stop_value <= cum_weight
+      i = 0
+      cum_weights.each_with_index do |cum_weight, index|
+        return choices[index] if stop_value <= cum_weight
       end
     end
   end
@@ -81,4 +82,4 @@ module PlanOut
       choices[rand_index]
     end
   end
-end
+end

data/lib/plan_out/version.rb

@@ -1,3 +1,3 @@
 module PlanOut
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/plan_out/operator_test.rb

@@ -3,14 +3,24 @@ require_relative '../test_helper'
 module PlanOut
   class OperatorTest < Minitest::Test
     def setup
-      @operator = Operator.new({ foo: 'bar' })
-      @op_simple = OpSimple.new({ bar: 'qux' })
+      @a = Assignment.new('mtsalt')
     end
 
     def test_execute
-      a = Assignment.new('mtsalt')
-      assert_equal('mtsalt', @operator.execute(a))
-      assert_equal(-1, @op_simple.execute(a))
+      operator = Operator.new({ foo: 'bar' })
+      op_simple = OpSimple.new({ bar: 'qux' })
+      assert_equal('mtsalt', operator.execute(@a))
+      assert_equal(-1, op_simple.execute(@a))
+    end
+
+    def test_weighted_choice
+      weighted = WeightedChoice.new({
+        choices: ["c1", "c2", "c1"],
+        weights: [20, 40, 60],
+        unit: 42,
+        salt:'x'
+      })
+      assert_equal("c2", weighted.execute(@a))
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: planout
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eytan Bakshy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler