rb_probdsl 0.0.1 → 0.0.2

data/examples/alarm.rb

@@ -75,16 +75,16 @@ def p_mary(a)
     flip( a == :A ? 0.7 : 0.01, :M, :notM)
 end
 
-p "joint probability:"
-p(prob do
+puts "\njoint probability:"
+puts(prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b,e)
     [b,e,a,p_john(a), p_mary(a)]
 end)
 
-p "P(B|John=true, Mary=true):"
-p(normalizedProb do
+puts "\nP(B|John=true, Mary=true):"
+puts(norm_prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b,e)
@@ -95,8 +95,8 @@ p(normalizedProb do
     end
 end)
 
-p "P(A|John=true, Mary=true)"
-p(normalizedProb do
+puts "\nP(A|John=true, Mary=true)"
+puts(norm_prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b, e)
@@ -109,8 +109,8 @@ end)
 
 # john and mary tell us for sure, the alarm went of and we know
 # that is true...
-p "P(B|John=true, Mary=true, Alarm=true)"
-p(normalizedProb do
+puts "\nP(B|John=true, Mary=true, Alarm=true)"
+puts(norm_prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b,e)
@@ -122,8 +122,8 @@ p(normalizedProb do
 end)
 
 # what is the probability john will call, if mary called?
-p "P(John|Mary=true)"
-p(normalizedProb do
+puts "\nP(John|Mary=true)"
+puts(norm_prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b,e)
@@ -135,8 +135,8 @@ p(normalizedProb do
 end)
 
 # and probability mary will call, if john did
-p "P(Mary|John=true)"
-p(normalizedProb do
+puts "\nP(Mary|John=true)"
+puts(norm_prob do
     b = p_burglary
     e = p_earthquake
     a = p_alarm(b,e)

data/examples/diagnosis.rb

@@ -51,7 +51,7 @@ def p_test(i)
 end
 
 p "P(I|T=Positive)"
-p normalizedProb {
+puts norm_prob {
     i = p_disease
     if p_test(i) == :Positive
         i

data/examples/montyhall.rb

@@ -98,8 +98,8 @@ end
 
 # print some results
 p 'strategy stay:'
-p(prob { stay(firstRound).testWinner })
+puts(prob { stay(firstRound).testWinner })
 
 p 'strategy switch:'
-p(prob { switch(firstRound).testWinner })
+puts(prob { switch(firstRound).testWinner })
 

data/examples/paradox.rb

@@ -18,7 +18,7 @@ the probability that the total on the uppermost faces of the two dice is "7"?
 Answear (2/11):
 HERE
 
-p normalizedProb {
+puts norm_prob {
     d1 = die; d2 = die
     if d1 == 4 || d2 == 4
         d1 + d2 == 7
@@ -31,7 +31,7 @@ puts <<HERE
 
 The same experiment using a simulation (t = 10s):
 HERE
-p collecting(loop_t 10) {
+puts collecting(loop_t 10) {
     d1 = die; d2 = die
     if d1 == 4 || d2 == 4
         d1 + d2 == 7

data/examples/test.rb

@@ -4,9 +4,9 @@ require 'rubygems'
 require 'probdsl'
 include ProbDSL
 
-p 'test1'
+puts "test1"
 
-p(prob {
+puts(prob {
     d = uniform [1,2,3,4,5,6]
     d
 })
@@ -23,7 +23,7 @@ def dice
     [d1, d2]
 end
 
-p(prob {
+puts(prob {
     d1 = die
     d2 = die
     d1 + d2
@@ -31,17 +31,17 @@ p(prob {
 
 p 'test3'
 
-p(prob{ die + die })
+puts(prob{ die + die })
 
 p 'test4'
 
-p(pick {
+puts(pick {
     dice
 })
 
 p 'test5'
 
-p(prob {
+puts(prob {
     d1, d2 = dice
     d1 + d2
 })
@@ -49,20 +49,20 @@ p(prob {
 p 'test6'
 tmp = prob{ dice }
 
-p(prob {
+puts(prob {
     d1, d2 = dist(tmp) # this time use already evaluated distribution
     d1 + d2
 })
 
 p 'test7'
 
-p(collecting(loop_k 1000) {
+puts(collecting(loop_k 1000) {
     die + die
 })
 
 p 'test8'
 
-p(collecting(loop_t 30) {
+puts(collecting(loop_t 30) {
     die + die
 })
 

data/lib/probdsl.rb

@@ -8,13 +8,25 @@ module ProbDSL
     include DelimCC
     include Probably
 
+    class PNone
+        def reify
+            nil
+        end
+
+        def pick
+            nil
+        end
+    end
+
+    PNil = PNone.new
+
     class PValue
         def initialize(v)
             @value = v
         end
 
         def reify
-            Probably.mkState @value
+            Probably.mk_const @value
         end
 
         def pick
@@ -22,6 +34,9 @@ module ProbDSL
         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
@@ -38,19 +53,22 @@ module ProbDSL
         end
 
         def pick
-            d = @fn.call
-            m,p = d.pick
-            k = m[0]
-            v = m[1]
-            tmp = k.call v
-            tmp.pick
+            dist = @fn.call
+            picked,probability = dist.pick
+            cont = picked[0]
+            value = picked[1]
+            cont.call(value).pick
         end
     end
 
     def run_prob(&blk)
         reset {
-            v = blk.call
-            PValue.new v
+            value = blk.call
+            if value == nil
+                PNil
+            else
+                PValue.new value
+            end
         }
     end
 
@@ -58,7 +76,7 @@ module ProbDSL
         run_prob(&blk).reify
     end
 
-    def normalizedProb(&blk)
+    def norm_prob(&blk)
         prob(&blk).normalize
     end
 
@@ -67,44 +85,42 @@ module ProbDSL
     end
 
     def collect(pred, tree)
-        m = Hash.new(0)
+        tmp = Hash.new(0)
         while (pred.call)
-            x = tree.pick
-            m[x] += 1.0
+            tmp[tree.pick] += 1.0
         end
-        Distribution.new :MAP, m
+        Distribution.new :MAP, tmp
     end
 
     def collecting(pred, &blk)
         collect(pred, run_prob(&blk))
     end
 
-    def loop_k(k)
-        tmp = k
+    def loop_k(ktimes)
+        tmp = ktimes
         proc {
-            r = tmp > 0
+            ret = tmp > 0
             tmp-=1
-            r
+            ret
         }
     end
 
-    def loop_t(s)
+    def loop_t(seconds)
         start = Time.now
         proc {
-            (Time.now - start) < s
+            (Time.now - start) < seconds
         }
     end
 
     def dist(data)
-        shift { |k|
+        shift { |cont|
             PChoice.new do
-                m = Hash.new(0)
-                data.each do |p,d|
-                    tmp = [k,d]
-                    m[tmp] += p
+                map = Hash.new(0)
+                data.each do |prob, dist|
+                    map[[cont, dist]] += prob
                 end
 
-                Distribution.new :MAP, m
+                Distribution.new :MAP, map
             end
         }
     end
@@ -113,14 +129,14 @@ module ProbDSL
         dist(data.map {|x| [1, x]})
     end
 
-    def flip(x, *data)
+    def flip(prob, *data)
         case data.length
         when 0
-            dist [[x, true], [1 - x, false]]
+            dist [[prob, true], [1 - prob, false]]
         when 1
-            dist [[x, data[0]], [1 - x, nil]]
+            dist [[prob, data[0]], [1 - prob, nil]]
         when 2
-            dist [[x, data[0]], [1 - x, data[1]]]
+            dist [[prob, data[0]], [1 - prob, data[1]]]
         else
             raise 'illegal number of arguments'
         end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rb_probdsl
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Steffen Siering
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +01:00
+date: 2010-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rb_prob
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rb_delimcc
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: steffen <dot> siering -> gmail <dot> com
 executables: []
@@ -61,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: do probabilistic programming in ruby