rb_probdsl 0.0.3 → 0.0.4

data/examples/paradox.rb

@@ -28,9 +28,11 @@ puts <<HERE
 
 The same experiment using a simulation (t = 10s):
 HERE
-puts collecting(loop_t 10) {
+prob, k = collecting(loop_t 10) do
     d1 = die; d2 = die
     guard d1 == 4 || d2 == 4
     d1 + d2 == 7
-}.normalize.probability(true)
+end
+puts "loops: #{k}"
+puts prob.normalize.probability(true)
 

data/examples/test.rb

@@ -62,7 +62,10 @@ puts(collecting(loop_k 1000) {
 
 p 'test8'
 
-puts(collecting(loop_t 30) {
+prob, k = collecting(loop_t 30) do
     die + die
-})
+end
+
+puts "loops: #{k}"
+puts prob
 

data/lib/probdsl.rb

@@ -8,59 +8,79 @@ module ProbDSL
     include DelimCC
     include Probably
 
-    class PNone
-        def reify
-            nil
+    class PDistribution < Distribution
+        def eval
+            self.dep do |m|
+                m.call.eval
+            end
         end
 
-        def pick
-            nil
+        def eval_pick
+            cont,* = pick
+            cont.call.eval_pick
         end
-    end
-
-    PNil = PNone.new
 
-    class PValue
-        def initialize(v)
-            @value = v
+        def flatten
+            self.dep do |m|
+                m.call.flatten
+            end
         end
 
-        def reify
-            Probably.mk_const @value
+        def to_d
+            tmp = self.map { |f|
+                f.call
+            }
+            shift do |cont|
+                tmp.map {|f|
+                    proc { cont.call(f) }
+                }
+                # self.map { |f|
+                #     proc { cont.call(f.call) }
+                # }
+            end
         end
+    end
 
-        def pick
-            @value
+    class PNone
+        def eval;      nil; end
+        def eval_pick; nil; end
+        def flatten;   nil; end
+
+        def call;      nil; end
+
+        def to_d
+            nil
         end
     end
 
-    # Tree Node in Decision tree.
-    # All sub nodes are unevaluated, so tree expansion is lazy
-    # and therefore different evaluation strategies may be implemented.
-    class PChoice
-        def initialize(&blk)
-            @fn = blk
+    class PValue
+        attr_reader :value
+
+        def initialize(v); @value = v; end
+        def eval;          PDistribution.mk_const @value; end
+        def eval_pick;     @value; end
+
+        def flatten
+            PDistribution.mk_const self
         end
 
-        def reify
-            d = @fn.call
-            d.dep do |m|
-                k = m[0]
-                v = m[1]
-                tmp = k.call(v)
-                tmp.reify
-            end
+        def call;         @value end
+
+        def eql?(b)
+            @value = b.value
         end
 
-        def pick
-            dist = @fn.call
-            picked,probability = dist.pick
-            cont = picked[0]
-            value = picked[1]
-            cont.call(value).pick
+        def hash
+            @value.hash
+        end
+
+        def to_d
+            @value
         end
     end
 
+    PNil = PNone.new
+
     def run_prob(&blk)
         reset {
             value = blk.call
@@ -73,7 +93,7 @@ module ProbDSL
     end
 
     def prob(&blk)
-        run_prob(&blk).reify
+        run_prob(&blk).eval
     end
 
     def norm_prob(&blk)
@@ -81,15 +101,17 @@ module ProbDSL
     end
 
     def pick(&blk)
-        run_prob(&blk).pick
+        run_prob(&blk).eval_pick
     end
 
     def collect(pred, tree)
         tmp = Hash.new(0)
+        n   = 0
         while (pred.call)
-            tmp[tree.pick] += 1.0
+            tmp[tree.eval_pick] += 1.0
+            n += 1
         end
-        Distribution.new :MAP, tmp
+        [PDistribution.new(:MAP, tmp), n]
     end
 
     def collecting(pred, &blk)
@@ -121,16 +143,15 @@ module ProbDSL
     end
 
     def dist(data)
-        shift { |cont|
-            PChoice.new do
-                map = Hash.new(0)
-                data.each do |prob, dist|
-                    map[[cont, dist]] += prob
-                end
-
-                Distribution.new :MAP, map
+        shift do |cont|
+            map = Hash.new 0
+            data.each do |prob, value|
+                tmp = proc { cont.call value }
+                map[tmp] = prob
             end
-        }
+
+            PDistribution.new :MAP, map
+        end
     end
 
     def uniform(data)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Steffen Siering
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +01:00
+date: 2010-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id002
 description: