calyx 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271f3418b869df3fa19a8d8ec31782a64a798ea9
-  data.tar.gz: 96b37bda20f6cc56c1ca9fba5899b4dd8beb9122
+  metadata.gz: 5ce625a176cd41a95aac8b5c2dcadc0ef95e3bf3
+  data.tar.gz: b0c911bdc364efe49b1c8d882823426eda62c23a
 SHA512:
-  metadata.gz: f5083d4be511ecef3e04fff2527619e52f23377ac91e84acda2b0e9e8d945936b292f90da2ac92fbd133dadc6eef592bee1be9db74dd48dbb64e09e6ebbacb17
-  data.tar.gz: 296b3f42152e2743f471b7c24752e7e6a0494dc6c12b70f9dfe4be73342848f9dd19fe771aa1aa5d2a7a41ddbd94a507726a3ed69221eca0b589d7491962e5d5
+  metadata.gz: d323c2e78271a53a8de7c8fe1b1925a35e0f0f20b85bc8fca503ac099f9517f3c2279a66e4cae765519acc58a9544d103e4bacfd34030b982eba05f363390e36
+  data.tar.gz: 348d17e64e1783360e947f9cca81d3770a1dc22c7cacc94f7977a6b2dc2fae472ecc677cf7e3c433968863704b6f7e097f50e09330d7f0024ea7783c4386a1d4

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
-  - 2.1.3
+  - 2.1
+  - 2.2
+  - rbx-2
+  - jruby-9
+  - ruby-head
+  - jruby-head
 before_install: gem install bundler -v 1.10.6
+script: bundle exec rspec

data/lib/calyx.rb

@@ -21,7 +21,11 @@ module Calyx
       end
 
       def construct_rule(productions)
-        Production::Choices.parse(productions)
+        if productions.first.is_a?(Enumerable)
+          Production::WeightedChoices.parse(productions)
+        else
+          Production::Choices.parse(productions)
+        end
       end
     end
 
@@ -51,10 +55,14 @@ module Calyx
 
         def self.parse(production)
           expansion = production.split(DELIMITER).map do |atom|
-            if atom.chars.first == '{' && atom.chars.last == '}'
-              NonTerminal.new(atom.slice(1, atom.length-2))
-            else
-              Terminal.new(atom)
+            if atom.is_a?(String)
+              if atom.chars.first == '{' && atom.chars.last == '}'
+                NonTerminal.new(atom.slice(1, atom.length-2))
+              else
+                Terminal.new(atom)
+              end
+            elsif atom.is_a?(Symbol)
+              NonTerminal.new
             end
           end
 
@@ -72,9 +80,29 @@ module Calyx
         end
       end
 
+      class WeightedChoices
+        def self.parse(productions)
+          weights_sum = productions.reduce(0) do |memo, choice|
+            memo += choice.last
+          end
+
+          raise 'Weights must sum to 1' if weights_sum != 1.0
+
+          self.new(productions)
+        end
+
+        def initialize(collection)
+          @collection = collection
+        end
+
+        def evaluate(registry)
+          @collection.max_by { |_, weight| rand ** (1.0 / weight) }.first
+        end
+      end
+
       class Choices
-        def self.parse(production)
-          choices = production.map do |choice|
+        def self.parse(productions)
+          choices = productions.map do |choice|
             if choice.is_a?(String)
               Concat.parse(choice)
             elsif choice.is_a?(Symbol)

data/lib/calyx/version.rb

@@ -1,3 +1,3 @@
 module Calyx
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calyx
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler