ceml 0.5.8 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.0

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-28}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [
@@ -32,11 +32,12 @@ Gem::Specification.new do |s|
      "examples/citizen-investigation.ceml",
      "examples/high-fives.ceml",
      "lib/ceml.rb",
-     "lib/ceml/casting_criterion.rb",
      "lib/ceml/casting_statement.rb",
+     "lib/ceml/confluence.rb",
      "lib/ceml/driver.rb",
      "lib/ceml/incident.rb",
      "lib/ceml/instruction_statements.rb",
+     "lib/ceml/role.rb",
      "lib/ceml/script.rb",
      "lib/ceml/tt/casting.treetop",
      "lib/ceml/tt/instructions.treetop",

data/lib/ceml/casting_statement.rb

@@ -1,18 +1,24 @@
 module CEML
+
+  class Criteria < Struct.new :plus_tags, :minus_tags, :matching, :radius, :timewindow
+    def complexity; plus_tags.size; end
+    def =~(candidate)
+      candidate[:tags] ||= []
+      (plus_tags - candidate[:tags]).empty? and (minus_tags & candidate[:tags]).empty?
+    end
+  end
+
   module CastingStatement
     extend Forwardable
     def_delegators :roles, :names, :[], :min
     alias_method :rolenames, :names
 
-    def criteria(script)
+    def roles_to_cast(script)
       return [] unless type == :await
-      group_by = if radius then [:city] else [] end
-      criteria_by_qualifiers = Hash.new do |h,k|
-        h[k] = CastingCriterion.new(script, k, [], group_by, radius, {})
+      roles.list.map do |r|
+        c = Criteria.new(r.qualifiers, [], radius ? [:city] : [], radius, timewindow)
+        Role.new r.name, c, r.min..r.max, []
       end
-
-      roles.list.each{ |r| criteria_by_qualifiers[r.qualifiers].role_counts[r.name] = r.min }
-      criteria_by_qualifiers.values
     end
 
     def type
@@ -23,8 +29,22 @@ module CEML
       roles.max
     end
 
+    def within_phrase
+      return if modifiers.empty?
+      modifiers.elements.select{ |m| m.respond_to? :distance }.first
+    end
+
+    def over_phrase
+      return if modifiers.empty?
+      modifiers.elements.select{ |m| m.respond_to? :duration }.first
+    end
+
+    def timewindow
+      over_phrase && over_phrase.duration.seconds
+    end
+
     def radius
-      within_phrase.empty? ? nil : within_phrase.distance.meters
+      within_phrase && within_phrase.distance.meters
     end
 
     def nab?

data/lib/ceml/confluence.rb

@@ -0,0 +1,50 @@
+require 'geokit'
+require 'forwardable'
+
+module CEML
+  class Confluence
+    attr_accessor :script, :hash, :created, :dirty, :roles_to_cast, :incident_id, :star
+    alias_method :launched?, :incident_id
+
+    def initialize script, candidate = nil
+      @script  = script
+      @hash    = {}
+      @created = true
+      @roles_to_cast = script.roles_to_cast
+      push candidate if candidate
+    end
+
+    def rm *candidates
+      @roles_to_cast.each{ |role| role.rm *candidates }
+    end
+
+    def best_role_for candidate
+      winner = @roles_to_cast.max_by{ |role| role.affinity(candidate, star) }
+      winner unless winner[0] == -1
+    end
+
+    def stage_with_candidate candidate
+      best_role = best_role_for(candidate)
+      return :uninterested unless best_role
+      return :joinable if launched?
+      other_roles = @roles_to_cast - [best_role]
+      return :launchable if best_role.one_left? and other_roles.all?(&:filled?)
+      return :listable
+    end
+
+    def push candidate
+      best_role = best_role_for(candidate)
+      candidate[:roles] = best_role.name.to_sym
+      best_role.casted << candidate
+      @dirty = true
+    end
+
+    def full?
+      @roles_to_cast.all?{ |role| role.allowed == 0 }
+    end
+
+    def cast
+      @roles_to_cast.map{ |r| r.casted }.flatten
+    end
+  end
+end

data/lib/ceml/driver.rb

@@ -21,27 +21,65 @@ module CEML
     end
     alias_method :start, :with_incident
 
-    LOCATIONS = {}
-    def ping script, candidate, metadata = {}
-      LOCATIONS[script] ||= []
-      script.post candidate, LOCATIONS[script]
-      LOCATIONS[script].delete_if do |loc|
-        next unless loc.cast
-        with_incident nil, script, metadata do |incident, players, metadata|
-          loc.cast.each{ |guy| subpost incident, players, metadata, guy.initial_state }
+    LOCATIONS = Hash.new{ |h,k| h[k] = [] }
+    def ping script, candidate
+      return unless script.fits? candidate
+      candidate[:ts] = Time.now.utc.to_i
+      script_id = script.text_value
+
+      locs = LOCATIONS[script_id].group_by{ |l| l.stage_with_candidate(candidate) }
+      if locs[:joinable]
+        # puts "joining..."
+        first = locs[:joinable].shift
+        first.push candidate
+        push first.incident_id, nil, candidate
+
+      elsif locs[:launchable]
+        # puts "launching..."
+        first = locs[:launchable].shift
+        first.push candidate
+        cast = first.cast
+        push nil, script, *cast
+        (locs[:launchable] + (locs[:listable]||[])).each{ |l| l.rm *cast }
+
+      elsif locs[:listable]
+        # puts "listing..."
+        locs[:listable].each{ |l| l.push candidate }
+
+      else
+        c = Confluence.new(script)
+        case c.stage_with_candidate(candidate)
+        when :launchable
+          # puts "start-launching..."
+          c.push candidate
+          push nil, script, candidate
+        when :listable
+          # puts "start-listing..."
+          c.push candidate
+          LOCATIONS[script_id] << c
+        else raise "what?"
         end
+
       end
+
+      LOCATIONS[script_id].delete_if(&:full?)
+      # save the changed ones and clear dirty flag
     end
 
-    def post incident_id, player = nil
-      with_incident incident_id do |incident, players, metadata|
-        subpost incident, players, metadata, player
+    def push incident_id, script, *updated_players
+      with_incident incident_id, script do |incident, players, metadata|
+        subpost incident, players, metadata, *updated_players
       end
     end
+
+    def post incident_id, *updated_players
+      push incident_id, nil, *updated_players
+    end
+
     alias_method :run, :post
 
-    def subpost incident, players, metadata, player = nil
-      if player
+    def subpost incident, players, metadata, *updated_players
+      updated_players.each do |player|
         player_id = player[:id]
         player[:roles] = Set.new([*player[:roles] || []])
         player[:roles] << :agents

data/lib/ceml/role.rb

@@ -0,0 +1,36 @@
+module CEML
+  class Role < Struct.new :name, :criteria, :range, :casted
+    # def <=>(b); b.criteria.complexity <=> criteria.complexity; end
+    def affinity candidate, star
+      return [-1, -1, -1 ] unless fits?(candidate, star)
+      [ criteria.complexity, -needed, -allowed ]
+    end
+
+    def filled?;   needed == 0; end
+    def one_left?; needed == 1; end
+
+    def rm(*ids); casted.delete_if{ |guy| ids.include? guy[:id] }; end
+    def needed; [range.min - casted.size, 0].max; end
+    def allowed; [range.max - casted.size, 0].max; end
+
+    def fits?(candidate, star = nil)
+      return false unless criteria =~ candidate
+      return false if casted.size >= range.max
+      return false if casted.any?{ |guy| guy[:id] == candidate[:id] }
+      return true unless star
+      c = criteria
+      if c.matching
+        return unless c.matching.all?{ |g| candidate[:matchables][g] == star[:matchables][g] }
+      end
+      if c.radius
+        c_ll = Geokit::LatLng(candidate[:lat], candidate[:lng])
+        s_ll = Geokit::LatLng(star[:lat], star[:lng])
+        return unless c_ll.distance_to(s_ll, :meters) <= c.radius
+      end
+      if c.timewindow
+        return unless star.ts - candidate.ts <= c.timewindow
+      end
+      return true
+    end
+  end
+end

data/lib/ceml/script.rb

@@ -8,16 +8,13 @@ module CEML
     # = casting =
     # ===========
 
-    # public
-    def post candidate, locs
-      return unless candidate = candidate.dup.load(awaited_criteria)
-      locs.each{ |l| l.push candidate }
-      locs << CastingLocation.create(self, candidate) if locs.none?(&:added)
+    def fits? candidate
+      roles_to_cast.any?{ |r| r.fits? candidate }
     end
 
-    def awaited_criteria
+    def roles_to_cast
       return [] unless cast.type == :await
-      return cast.criteria(self)
+      return cast.roles_to_cast(self)
     end
 
     def nabs?

data/lib/ceml/tt/casting.treetop

@@ -3,7 +3,15 @@ grammar Casting
     include Lexer
 
     rule casting_statement
-      ('gather' / 'await' / 'nab') ws roles within_phrase:within_phrase? <CastingStatement>
+      ('gather' / 'await' / 'nab') ws roles modifiers:modifier_phrase* <CastingStatement>
+    end
+
+    rule modifier_phrase
+      over_phrase / within_phrase
+    end
+
+    rule over_phrase
+        ws 'over' ws duration
     end
 
     rule within_phrase

data/lib/ceml/tt/lexer.treetop

@@ -34,7 +34,7 @@ grammar Lexer
     end
 
     rule reserved_word
-        'and' / 'within'
+        'and' / 'within' / 'over'
     end
 
     rule id
@@ -42,11 +42,11 @@ grammar Lexer
     end
 
     rule duration
-      number ws? time_unit:('seconds' / 'second' / 's' / 'minutes' / 'minute' / 'min')
+      number ws? time_unit:('seconds' / 'second' / 's' / 'minutes' / 'minute' / 'min' / 'hours' / 'hour' / 'hr' / 'h')
       {
           def seconds
               number.text_value.to_f * case time_unit.text_value
-              when /^mi/; 60; else 1; end
+              when /^h/; 60*60; when /^mi/; 60; else 1; end
           end
       }
     end

data/lib/ceml.rb

@@ -9,7 +9,8 @@ require 'ceml/tt/casting'
 require 'ceml/tt/instructions'
 require 'ceml/tt/scripts'
 
-require 'ceml/casting_criterion'
+require 'ceml/role'
+require 'ceml/confluence'
 require 'ceml/incident'
 require 'ceml/driver'
 

data/test/test_incident.rb

@@ -65,9 +65,7 @@ class TestIncident < Test::Unit::TestCase
   def test_jane
     s = CEML.parse(:script, JANE_SCRIPT)
     play do
-      c = CEML::Candidate.new('fred', ['new'], {})
-      c.initial_state = { :received => 'freddy' }
-      ping s, c
+      ping s, :id => 'fred', :tags => ['new'], :received => 'freddy'
       asked 'fred', /Hello freddy. You are Level Zero./
       says 'fred', "shoeless"
       asked 'fred', /favorite game/
@@ -97,7 +95,7 @@ class TestIncident < Test::Unit::TestCase
   def test_signup_1
     s = CEML.parse(:script, "await 1 new signup\ntell signup: thanks")
     play do
-      ping s, CEML::Candidate.new('fred', ['new'], {})
+      ping s, :id => 'fred', :tags => ['new']
       told 'fred', /thanks/
     end
   end
@@ -105,11 +103,11 @@ class TestIncident < Test::Unit::TestCase
   def test_signup_2
     s = CEML.parse(:script, "await 2 new signups\ntell signups: thanks")
     play do
-      ping s, CEML::Candidate.new('fred', ['new'], {})
+      ping s, :id => 'fred', :tags => ['new']
       silent 'fred'
-      ping s, CEML::Candidate.new('wilma', ['old'], {})
+      ping s, :id => 'wilma', :tags => ['old']
       silent 'fred'
-      ping s, CEML::Candidate.new('betty', ['new'], {})
+      ping s, :id => 'betty', :tags => ['new']
       told 'fred', /thanks/
     end
   end
@@ -117,12 +115,12 @@ class TestIncident < Test::Unit::TestCase
   def test_await
     s = CEML.parse(:script, "await a,b,c\ntell a: foo\ntell b: bar\ntell c: baz")
     play do
-      ping s, CEML::Candidate.new('fred', [], {})
+      ping s, :id => 'fred'
       silent 'fred'
-      ping s, CEML::Candidate.new('wilma', [], {})
+      ping s, :id => 'wilma'
       silent 'fred'
       silent 'wilma'
-      ping s, CEML::Candidate.new('betty', [], {})
+      ping s, :id => 'betty'
       told 'fred', /foo/
       told 'betty', /baz/
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,12 @@ files:
 - examples/citizen-investigation.ceml
 - examples/high-fives.ceml
 - lib/ceml.rb
-- lib/ceml/casting_criterion.rb
 - lib/ceml/casting_statement.rb
+- lib/ceml/confluence.rb
 - lib/ceml/driver.rb
 - lib/ceml/incident.rb
 - lib/ceml/instruction_statements.rb
+- lib/ceml/role.rb
 - lib/ceml/script.rb
 - lib/ceml/tt/casting.treetop
 - lib/ceml/tt/instructions.treetop

data/lib/ceml/casting_criterion.rb

@@ -1,90 +0,0 @@
-require 'geokit'
-require "forwardable"
-
-module CEML
-  class Candidate < Struct.new :uid, :tags, :matchables, :lat, :lng, :initial_state
-    include Geokit::Mappable
-    attr_reader :criteria
-
-    def load(criteria)
-      @criteria = criteria.select{ |c| c =~ self }
-      if @criteria.empty? then nil else self end
-    end
-
-    def criteria_for_location(star)
-      criteria.select{ |c| c.fits?(self, star) }
-    end
-  end
-
-  class CastingLocation < Struct.new :script, :hash, :created
-    attr_accessor :added
-    def star; hash.values.flatten.first; end
-
-    def criteria
-      @criteria ||= script.awaited_criteria.sort_by{ |c| [-c.complexity, c.min_match] }
-    end
-
-    def push candidate
-      matching_criteria = candidate.criteria_for_location(star)
-      return if matching_criteria.empty?
-      matching_criteria.each{ |c| (hash[c] ||= []) << candidate }
-      @added = true
-    end
-
-    def self.create script, candidate
-      new(script, {}, true).tap{ |x| x.push candidate }
-    end
-
-    # this method will miss possible castings and does not handle ranges at all
-    def cast
-      [].tap do |casting|
-        criteria.each do |c|
-          return nil unless folks = hash[c].dup
-          folks -= casting
-          return nil unless folks.size >= c.min_match
-          c.role_counts.each do |role, minct|
-            folks.shift(minct).each do |guy|
-              guy.initial_state ||= {}
-              guy.initial_state[:id] = guy.uid
-              guy.initial_state[:roles] = role.to_sym
-              casting << guy
-            end
-          end
-        end
-      end
-    end
-  end
-
-  class CastingCriterion < Struct.new :script, :plus_tags, :minus_tags, :grouped_by, :radius, :role_counts
-    def min_match;  role_counts.values.reduce(:+); end
-    def complexity; plus_tags.size; end
-
-    def =~(candidate)
-      (plus_tags - candidate.tags).empty? and (minus_tags & candidate.tags).empty?
-    end
-
-    def fits?(candidate, star)
-      return true unless star
-      return unless grouped_by.all?{ |g| candidate.matchables[g] == star.matchables[g] }
-      p radius
-      !radius or candidate.distance_to(star, :meters) <= radius
-    end
-  end
-end
-
-# def satisfied_by_group?(people, already_used)
-#   if (people - already_used).size >= min_match
-#     already_used.concat((people - already_used).first(min_match))
-#     true
-#   end
-# end
-
-# this method and the one below will miss possible
-# castings and do not handle ranges at all
-# def complete?(loc)
-#   people_used = []
-#   @criteria.all? do |c|
-#     next unless folks = loc[c.hash]
-#     c.satisfied_by_group?(folks, people_used)
-#   end
-# end