y_nelson 2.1.0 → 2.3.0

data/README.md

@@ -34,3 +34,4 @@ structure aspect is still under development.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+

data/lib/y_nelson/agent.rb

@@ -16,8 +16,14 @@
 class YNelson::Agent
   attr_reader :world
 
-  include YPetri::Agent::PetriNetRelated
-  include YPetri::Agent::SimulationRelated
+  ★ YPetri::Agent::PetriNetAspect
+  ★ YPetri::Agent::SimulationAspect
+
+  # Future module YNelson::Agent::SimulationRelated
+
+  # Calls #finalize before invoking YPetri::Agent#new_simulation.
+  #
+  def new_simulation *args; finalize; super end
 
   # Initialization of a YNelson::Agent instance. For YNelson manipulators, the
   # world is always YNelson itself.
@@ -37,6 +43,7 @@ class YNelson::Agent
       YNelson::DimensionPoint.new YNelson.Dimension( :row )
     @secondary_dimension_point =
       YNelson::DimensionPoint.new YNelson.Dimension( :column )
+    @todo = [] # array of blocks
   end
 
   # Now the part related to the zz structure itself, like in
@@ -48,20 +55,9 @@ class YNelson::Agent
   attr_reader :sheets
 
   # Dimension convenience constructor from 
-  delegate( :Dimension,
-            to: :world )
+  delegate :Dimension,
+           to: :world
   
-  # Creation of a single-output formula known well from spreadseets. Given a
-  # place, it creates a new assignment transition.
-  # 
-  def ϝ &block
-    new_place = YNelson::Place.new
-    new_transition = YNelson::Transition.new assignment: true,
-                                             codomain: new_place,
-                                             action: block
-    return new_place, new_transition
-  end
-
   # Now let's look into the graph visualization.
 
   def default_dimension
@@ -151,6 +147,52 @@ class YNelson::Agent
 
   # graphviz [:domain, 0 ], [:codomain, 0]
 
+
+  # Creation of a place governed by a single assignment transition. In other
+  # words, creation of a place with a unary-output formula known well from
+  # spreadsheets. The transition is named automatically by adding "_ϝ"
+  # (digamma, resembles mathematical f used to denote functions) suffix to
+  # the place's name, as soon as the place is named. For example,
+  # 
+  # Fred = PAT Joe do |joe| joe * 2 end
+  # 
+  # creates a place named "Fred" and an assignment transition named "Fred_ϝ"
+  # that keeps Fred equal to 2 times Joe.
+  #
+  def PAT *domain, **named_args, &block
+    Place().tap do |p| # place can be instantiated right away
+      p.name = named_args.delete :name if named_args.has? :name, syn!: :ɴ
+      @todo << -> {
+        t = AT p, domain: domain, &block
+        if p.name then t.name = "#{p.name}_ϝ" else
+          # Rig the hook to name the transition as soon as the place is named.
+          p.name_set_hook do |name| transition.name = "#{name}_ϝ" end
+        end
+        # Monkey-patch the place with default marking closure.
+        p.define_singleton_method :default_marking do
+          if has_default_marking? then local_variable_get :@default_marking else
+            t.action_closure.( *t.domain.map( &:default_marking ) )
+          end
+        end
+      }
+    end
+  end
+  alias ϝ PAT
+
+  # Executes all @todo closures.
+  # 
+  def finalize
+    while not @todo.empty?
+      @todo[-1].call # May raise errors in which case we don't want to pop.
+      @todo.pop      # That's why not @todo.pop.call while not @todo.empty?
+    end
+  end
+
+  # ============================================================================
+  # === THE METHODS BELOW ARE NOT REVIEWED FOR THE NEW VERSION AND NOT       ===
+  # === EXPOSED IN THE DSL YET                                               ===
+  # ============================================================================
+
   # Cell side referencers with r. to primary and secondary point
   def ξ_posward_side dim=nil; ::YTed::POINT.posward_side dim end
   alias :ξp :ξ_posward_side
@@ -273,106 +315,4 @@ class YNelson::Agent
       .define_singleton_method name.to_sym do ::YTed::SHEETS[name] end
     return ::YTed::SHEETS[name]
   end
-
-  def make_transitions
-    # require 'debug'
-    # LATER: When walking around the sheets, currently, there is no
-    # protection against references to empty cells
-    @transitions_to_make.map { |prescription|
-      sheet = prescription[:sheet]
-      type = prescription[:type]
-      place = prescription[:place]
-      block = prescription[:assignment_closure]
-
-      case type
-      when :unary_codomain_w_magic_block
-        # PARAMETER MAGIC:
-        # Blocks with specially named input arguments
-        domain = block.parameters.map{ |e| e[1].to_s }.map{ |param|
-          point = ZzPoint.new( place )
-          if SHEETS.keys.include? sheet_name = param.split('_')[0] then
-            # if the name consists of a sheet and parameter name, then ok
-            rest = param[sheet_name.size + 1..-1]
-            point = ZzPoint.new( SHEETS[sheet_name][0][0] )
-            col = [*('a'..'z')].index rest[0]
-            point.rewind_negward! :x
-            if rest.size > 1 then # also change row, asssuming "a0" style
-              point.rewind_negward! :y
-              row = rest[1..-1].to_i
-              row.times { point.step_posward :y }
-            end
-            col.times { point.step_posward :x }
-            point.cell
-          elsif [*('a'..'z')].include? param[0] then
-            # if the name consists of an alphabetic letter...
-            col = [*('a'..'z')].index param[0]
-            point.rewind_negward! :x
-            if param.size > 1 then # also change row, assuming "a0" style
-              point.rewind_negward! :y
-              row = param[1..-1].to_i
-              row.times { point.step_posward :y }
-            end
-            col.times { point.step_posward :x }
-            point.cell
-          elsif param[0] = '_' then
-            # Params named '_1', '_2', ... refer to different rows, same :col,
-            # param named '__' refers to same cell
-            if param == '__' then cell else
-              i = param[1..-1].to_i
-              point.rewind_negward! :y
-              i.times { point.step_posward :x }
-              point.cell
-            end
-          else
-            raise TypeError, "unrecognized magic block parameter: #{param}"
-          end
-        } # block.parameters.map
-        
-        # Instantiate the new transition (do not fire it yet):
-        Transition( domain: domain,
-                    codomain: [ place ],
-                    action_closure: block,
-                    assignment_action: true )
-      when :downstream_copy
-        # DOWNSTREAM COPY
-        # A single transition assigning upstream value to the downstream cell
-        Transition( domain: prescription[:domain],
-                                  codomain: [ place ],
-                                  action_closure: λ {|v| v },
-                                  assignment_action: true )
-      else raise "Unknown transition prescription type: #{prescription[:type]}"
-      end
-    } # @transitions_to_make.map
-  end
-
-  # Places an order for a spreadsheet-like assignment transition. The order
-  # will be fullfilled later when #make_transitions method is called.
-  # 
-  def new_downstream_cell &block
-    # The place can be instatiated right away
-    place = ZzCell( nil )
-
-    # Transition making requests get remembered in @transitions_to_make:
-    ( @transitions_to_make ||= [] ) <<
-      { place: place,
-        sheet: @current_sheet_name,
-        assignment_closure: block,
-        type: :unary_codomain_w_magic_block }
-    return place
-  end
-  alias :ϝ :new_downstream_cell
-
-  # Places an order for a spreadsheet-lie pure reference to another cell.
-  # 
-  def new_downstream_copy( cell )
-    # Again, the place can be instantiated immediately
-    p = ZzCell( nil )
-
-    # And put the transition making request to @transitions_to_make:
-    ( @transitions_to_make ||= [] ) <<
-      { place: p, sheet: @current_sheet_name, domain: cell,
-        type: :downstream_copy }
-    return p
-  end
-  alias :↱ :new_downstream_copy
 end

data/lib/y_nelson/dsl.rb

@@ -67,10 +67,9 @@ module YNelson
             :plot_delta,
             to: :y_nelson_agent )
 
-
   # Zz aspect.
   delegate( :Dimension,
-            :ϝ,
+            :sheets,
             :default_dimension,
             :primary_point, :p1,
             :secondary_point, :p2,
@@ -78,5 +77,7 @@ module YNelson
             :secondary_dimension_point, :d2,
             :visualize,
             :graphviz,
+            :PAT, :ϝ,
+            :finalize,
             to: :y_nelson_agent )
 end # module YNelson

data/lib/y_nelson/place.rb

@@ -1,4 +1,3 @@
-
 # YNelson::Place is analogical to a spreadsheet cell. It is based on
 # YPetri::Place and offers simlar interace.
 # 

data/lib/y_nelson/version.rb

@@ -1,4 +1,4 @@
 module YNelson
   DEBUG = false
-  VERSION = "2.1.0"
+  VERSION = "2.3.0"
 end

data/lib/y_nelson/zz_point.rb

@@ -1,4 +1,4 @@
-#encoding: utf-8
+# coding: utf-8
 
 # A pointer to a Zz object. A glorified variable, basically.
 # 

data/lib/y_nelson.rb

@@ -61,8 +61,8 @@ module YNelson
     attr_reader :dimensions
 
     # Including instance methods of YPetri::World:
-    include YPetri::World::PetriNetRelated
-    include YPetri::World::SimulationRelated
+    include YPetri::World::PetriNetAspect
+    include YPetri::World::SimulationAspect
 
     # Allows summoning YNelson::DSL by 'include YNelson'.
     # 
@@ -70,6 +70,20 @@ module YNelson
       receiver.extend YNelson::DSL
       receiver.delegate :y_nelson_agent, to: "self.class"
     end
+
+    # TODO: YNelson class, obviously, works. But there is something funny
+    # about how it works. It seems that all the important methods, such
+    # as Place(), Transition(), run!() don't go through the Agent (via
+    # receiver.extend YNelson::DSL), but instead go directly through
+    # include YPetri::World::PetriNetAspect and
+    # include YPetri::World::SimulationAspect. While it is appropriate
+    # that YNelson singleton class, since we have decided that it would
+    # be basically a kind of YPetri::World, should have attributes of
+    # YPetri::World, it is surprising that the method calls that are
+    # supposed to be intercepted by the agent and only then sent to the
+    # world, are handled by the world directly. This seems to be a problem
+    # and a topic for the future refactor.
+
   end # class << self
 
   # Parametrize the Place / Transition / Net classes.

data/y_nelson.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |spec|
   spec.version       = YNelson::VERSION
   spec.authors       = ["boris"]
   spec.email         = ["\"boris@iis.sinica.edu.tw\""]
-  spec.description   = %q{Formalization and generalization of a spreadsheet.}
   spec.summary       = %q{A fusion of functional Petri net with a zz structure.}
+  spec.description   = %q{Formalization and generalization of a spreadsheet.}
   spec.homepage      = ""
   spec.license       = "GPLv3"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'yzz'
   spec.add_dependency 'y_petri'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_nelson
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yzz
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,17 +75,15 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Introduction_to_Ruby_for_YNelson_Users.lyx
+- Introduction_to_Ruby_for_YNelson_Users.pdf
 - Introduction_to_YNelson.lyx
+- Introduction_to_YNelson.pdf
 - LICENSE.txt
+- Object_model_of_YNelson_and_YPetri.lyx
+- Object_model_of_YNelson_and_YPetri.pdf
 - README.md
 - Rakefile
-- Ruby_for_YNelson_Users_in_20_minutes.lyx
-- Ruby_for_YNelson_Users_in_20_minutes.pdf
-- YNelson_&_YPetri_User_Manual.lyx
-- YNelson_&_YPetri_User_Manual.pdf
-- YNelson_-_Hands-on_Tutorial.lyx
-- YNelson_-_Hands-on_Tutorial.pdf
-- config/mongoid.yml
 - lib/y_nelson.rb
 - lib/y_nelson/agent.rb
 - lib/y_nelson/dimension.rb
@@ -96,11 +94,9 @@ files:
 - lib/y_nelson/transition.rb
 - lib/y_nelson/version.rb
 - lib/y_nelson/yzz.rb
-- lib/y_nelson/zz.png
 - lib/y_nelson/zz_point.rb
 - test/mongoid_example.rb
 - test/y_nelson_test.rb
-- test/zz.png
 - y_nelson.gemspec
 homepage: ''
 licenses:
@@ -122,11 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A fusion of functional Petri net with a zz structure.
 test_files:
 - test/mongoid_example.rb
 - test/y_nelson_test.rb
-- test/zz.png