andromeda 0.1.2 → 0.1.3

data/lib/andromeda/map_reduce.rb

@@ -1,3 +1,3 @@
 module Andromeda
-	# unimplemented
+  # unimplemented
 end

data/lib/andromeda/patch/array_bin_search.rb

@@ -0,0 +1,83 @@
+class ::Array
+
+  class Tag
+    attr_reader :key
+    attr_accessor :value
+
+    def initialize(key, value = nil)
+      @key   = key
+      @value = value
+    end
+
+    def untagged ; value end
+
+    def <=>(other)
+      return key <=> other.key
+    end
+
+    def to_s
+      "Tag(#{key.to_s} => #{value.to_s})"
+    end
+
+    alias_method :inspect, :to_s
+  end
+
+  # Binary search for the first elem that is leq elem in this array in the range
+  # (low..high-1)
+  #
+  # The array is expected to be sorted in descending order.
+  #
+  # @param [Object] elem elem to search for
+  # @param [Fixnum] low lower bound (inclusive)
+  # @param [Fixnum] high upper bound (inclusive, -1 for last element)
+  # @return [Fixnum] index of first occurence leq than elem in self, or -1 if not found
+  #
+  def bin_search(elem, low = 0, high = -1)
+    high = size - 1 if high < 0
+    _bin_search elem, low, high
+  end
+
+  # Wraps all objects in self into ::Array::Tag instances using
+  # the provided block to extract a key
+  #
+  # @return [self]
+  #
+  def tag! ; map! { |e| Tag.new (yield e), e } end
+
+  # Untags Array::Tag instances, i.e. replaces them with their value
+  #
+  # @return [self]
+  #
+  def untag! ; map! { |e| e.untagged } end
+
+  private
+
+  def _bin_search(elem, low, high)
+    last = -1
+    while low <= high
+      sz = high - low
+      # On 2012 cpus, linear search is slightly faster than binary search
+      # if the number of searched elements is in the range of 50-100 elts
+      return _lin_search elem, low, high if (sz >> 6)
+      mid_index = low + (sz >> 1)
+      if (elem <=> self[mid_index]) == -1
+        low  = mid_index + 1
+      else
+        last = mid_index
+        high = mid_index - 1
+      end
+    end
+    return last
+  end
+
+  def _lin_search(elem, low, high)
+    cur_index = low
+    while cur_index <= high
+      if (elem <=> self[cur_index]) == -1
+        then cur_index += 1
+        else return cur_index end
+    end
+    return -1
+  end
+
+end

data/lib/andromeda/plan.rb

@@ -2,8 +2,8 @@ module Andromeda
 
   class Plan < Impl::ProtoPlan
 
-    meth_spot :enter
-    attr_spot :errors
+    spot_meth :enter
+    spot_attr :errors
 
     signal_spot :errors
 
@@ -37,9 +37,9 @@ module Andromeda
     def log ; @log = DefaultLogger.instance end
     def mark ; @mark = Id.zero unless @mark ; @mark end
 
-    def on_enter(k, v)
+    def on_enter(key, val)
       exit_ = exit
-      exit_ << v if exit_
+      exit_ << val if exit_
     end
 
     def to_short_s

data/lib/andromeda/spot.rb

@@ -31,7 +31,7 @@ module Andromeda
     def initialize(plan, name, here, dest = nil)
       raise ArgumentError, "#{plan} is not a Plan" unless plan.is_a? Plan
       raise ArgumentError, "#{name} is not a Symbol" unless name.is_a? Symbol
-      unless plan.meth_spot_name?(name)
+      unless plan.spot_meth_name?(name)
         raise ArgumentError, "#{name} is not a known method spot name of #{plan}"
       end
       unless dest.nil? || dest.is_a?(Symbol)
@@ -114,8 +114,8 @@ module Andromeda
 
     def >>(target)
       return (plan >> target) unless dest_name
-      unless plan.attr_spot_name?(dest_name)
-        raise ArgumentError, "#{dest_name} is not an attr_spot_name"
+      unless plan.spot_attr_name?(dest_name)
+        raise ArgumentError, "#{dest_name} is not an spot_attr_name"
       end
       plan.send :"#{dest_name}=", target.entry
       plan.public_spot(dest_name)

data/lib/andromeda/sugar.rb

@@ -6,25 +6,25 @@ module Andromeda
 
   module Guides
 
-    def self.default ; DefaultGuide.instance end
-    def self.single ; SinglePoolGuide.new end
+    def self.default=(new_guide)
+      DefaultGuideHolder.instance.guide = new_guide
+    end
+
+    def self.default ;  DefaultGuideHolder.instance.guide end
+
+    def self.single ; SinglePoolGuide end
+    def self.shared_single ; SharedSinglePoolGuide end
+    def self.pool ; PoolGuide end
     def self.shared_pool ; SharedPoolGuide end
-    def self.pool ; SharedPoolGuide.new end
     def self.local ; LocalGuide end
-    def self.shared_single ; SharedSinglePoolGuide end
 
-    class DefaultGuide < SimpleDelegator
+    class DefaultGuideHolder
       include Singleton
 
-      def initialize
-        super LocalGuide.instance
-      end
+      attr_accessor :guide
 
-      def instance=(new_instance)
-        if new_instance.is_a?(Class) && new_instance.include?(Singleton)
-          new_instance = new_instance.instance
-        end
-        instance.__setobj__ new_instance
+      def initialize
+        @guide = LocalGuide
       end
     end
 

data/lib/andromeda/sync.rb

@@ -53,12 +53,14 @@ module Andromeda
 
     # Passes all input and waits for the associated scope to return to the start value
     # (will only work if there is no concurrent modification to the associated scope)
-    class ScopeWaiter < Plan
+    class Bracket < Plan
 
-      def on_enter(k, v)
+      def init_guide ; ::Andromeda::Guides::LocalGuide end
+
+      def on_enter(key, val)
         scope_ = current_scope
         value_ = scope_.value
-        super k, v
+        super key, val
         scope_.wait_until_eq value_
       end
     end

data/lib/andromeda/version.rb

@@ -1,3 +1,3 @@
 module Andromeda
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/yard_extensions/andromeda.rb

@@ -1,7 +1,7 @@
 require 'yard'
 
 class MethSpotHandler < YARD::Handlers::Ruby::AttributeHandler
-  handles method_call(:meth_spot)
+  handles method_call(:spot_meth)
   namespace_only
 
   def process
@@ -10,7 +10,7 @@ class MethSpotHandler < YARD::Handlers::Ruby::AttributeHandler
 end
 
 class AttrSpotHandler < YARD::Handlers::Ruby::AttributeHandler
-  handles method_call(:attr_spot)
+  handles method_call(:spot_attr)
   namespace_only
 
   def process

metadata

@@ -1,16 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: andromeda
 version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
 authors:
 - Stefan Plantikow
 autorequire: 
 bindir: script
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
-dependencies: []
+date: 2012-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: &9592 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: *9592
+  name: json
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9656 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: *9656
+  name: atomic
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9700 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: *9700
+  name: facter
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9744 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: *9744
+  name: statval
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9788 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: *9788
+  name: threadpool
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9832 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: *9832
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9876 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: *9876
+  name: simplecov
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9920 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: *9920
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &9964 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: *9964
+  name: yard
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &10008 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: *10008
+  name: redcarpet
+  prerelease: false
 description: Andromeda is a light weight framework for complex event processing on
   multicore architectures. Andromeda users construct networks of plans that are interconnected
   via endpoint spots, describe how plans are scheduled onto threads, and process data
@@ -42,11 +152,14 @@ files:
 - lib/andromeda/id.rb
 - lib/andromeda/impl/atom.rb
 - lib/andromeda/impl/class_attr.rb
+- lib/andromeda/impl/id.rb
 - lib/andromeda/impl/proto_plan.rb
 - lib/andromeda/impl/to_s.rb
 - lib/andromeda/impl/xor_id.rb
+- lib/andromeda/impl_base.rb
 - lib/andromeda/kit.rb
 - lib/andromeda/map_reduce.rb
+- lib/andromeda/patch/array_bin_search.rb
 - lib/andromeda/plan.rb
 - lib/andromeda/pool_guide.rb
 - lib/andromeda/spot.rb
@@ -63,23 +176,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: andromeda
 rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
-summary: light weght framework for complex event processing based on a dataflow DSL
+summary: light weight framework for complex event processing based on a dataflow DSL
 test_files:
 - spec/spec_helper.rb
 has_rdoc: