y_petri 2.1.7 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ea7adac33bd23959ee963e2851c77d591abbd6b
-  data.tar.gz: 0a31445de87006e8f6621b0eae44c17111316b37
+  metadata.gz: 70791aeefd6b43e56ccdbf4fb980d51768e4ecec
+  data.tar.gz: d3b852100353e1df976a7c8f3ffd84e0cd2c6dce
 SHA512:
-  metadata.gz: 8c3123d34cdff6f50fc9962aaf188578b1228325d713c6ee16986d0d4507d6e0a4cd415b817b217e70abf395e82ecb42f65bb631d8cdcad713a2f2dac02b77b1
-  data.tar.gz: ab7df7db2696bec33d0cf4c5baa2dea48450688f10412f2b1fbf8246db3ca00826da585ec4806db216263e79d5ce3dbfe50a6609fedd20de1016c76d04b0b094
+  metadata.gz: a03c5f1c57429be512c5e023e99a92a9973c7ad94df76f75d04cdca96e02fa530d91383ea360c06a4e354d3a8824b8b6885d3ff76bb4d3a553e395813aa321ba
+  data.tar.gz: 844311666d998f34bec07216f7ea0cd37233b0f4309ed88860dcda7f4dfc44e61931c08e246f024f4fee33741dbbe32ac443cca0829e7bdb9893e66fbfa127a4

data/lib/y_petri/agent/petri_net_related.rb

@@ -65,13 +65,13 @@ module YPetri::Agent::PetriNetRelated
     named_args.update( guard: block ) if block # use block as a guard
     named_args.may_have :default_marking, syn!: :m!
     named_args.may_have :marking, syn!: :m
-    world.Place.new *ordered_args, **named_args
+    world.Place.send( :new, *ordered_args, **named_args, &block )
   end
 
   # Transition constructor: Creates a new transition in the current world.
   # 
   def Transition( *ordered, **named, &block )
-    world.Transition.new *ordered, **named, &block
+    world.Transition.send( :new, *ordered, **named, &block )
   end
 
   # Timed transition constructor: Creates a new timed transition in the current
@@ -80,7 +80,7 @@ module YPetri::Agent::PetriNetRelated
   def T( *ordered, **named, &block )
     fail ArgumentError, "Timed transition constructor requires a block " +
       "defining the rate function!" unless block
-    world.Transition.new *ordered, **named.update( rate: block )
+    world.Transition.send( :new, *ordered, **named.update( rate: block ) )
   end
 
   # Timed stoichiometric transition constructor, that expects stoichiometry
@@ -103,16 +103,17 @@ module YPetri::Agent::PetriNetRelated
   def A( *codomain, **nn, &block )
     fail ArgumentError, "Assignment transition constructor requires a block " +
       "defining the assignment function!" unless block
-    world.Transition.new codomain: codomain,
-                         assignment: true,
-                         action: block,
-                         **nn
+    world.Transition.send( :new,
+                           codomain: codomain,
+                           assignment: true,
+                           action: block,
+                           **nn )
   end
 
   # Net constructor: Creates a new Net instance in the current world.
   # 
   def Net *ordered, **named, &block
-    world.Net.new *ordered, **named, &block
+    world.Net.send( :new, *ordered, **named, &block )
   end
 
   # Returns the net identified, or the net at point (if no argument given).

data/lib/y_petri/agent/simulation_related.rb

@@ -234,8 +234,8 @@ module YPetri::Agent::SimulationRelated
 
   # Create a new timed simulation and run it.
   # 
-  def run!
-    new_simulation.run!
+  def run! *args
+    new_simulation.run! *args
   end
 
   # Write the recorded samples in a file (csv).

data/lib/y_petri/dsl.rb

@@ -56,7 +56,7 @@ module YPetri
            :print_recording,
            :plot,
            :plot_selected,
-#          :plot_state,
+  #        :plot_state,
            :plot_flux,
            to: :y_petri_agent
 

data/lib/y_petri/net/state/feature/flux.rb

@@ -3,7 +3,7 @@
 # Flux of a Petri net TS transition.
 # 
 class YPetri::Net::State::Feature::Flux < YPetri::Net::State::Feature
-  attr_reader :transitionn
+  attr_reader :transition
 
   class << self
     def parametrize *args

data/lib/y_petri/net.rb

@@ -26,6 +26,8 @@ class YPetri::Net
     def of *elements
       new.tap { |inst| elements.each { |e| inst << e } }
     end
+
+    private :new
   end
 
   delegate :world, to: "self.class"

data/lib/y_petri/place.rb

@@ -14,6 +14,8 @@ class YPetri::Place
 
   class << self
     ★ YPetri::World::Dependency
+
+    private :new
   end
 
   delegate :world, to: "self.class"

data/lib/y_petri/simulation/timed.rb

@@ -38,7 +38,7 @@ module YPetri::Simulation::Timed
     initial_time..target_time
   end
 
-  # Returnst the settings pertaining to the Timed aspect of the simulation,
+  # Returns the settings pertaining to the Timed aspect of the simulation,
   # that is, +:step+, +:sampling+ and +:time+.
   #
   def settings all=false
@@ -48,7 +48,7 @@ module YPetri::Simulation::Timed
   end
 
   # Same as +#run!+, but guards against run upto infinity.
-  #
+  # 
   def run( upto: target_time, final_step: :exact )
     fail "Upto time equals infinity!" if upto == Float::INFINITY
     run!( upto: upto, final_step: final_step )
@@ -57,7 +57,7 @@ module YPetri::Simulation::Timed
   # Near alias for +#run_upto+. Accepts +:upto+ named argument, using
   # @target_time attribute as a default. The second optional argument,
   # +:final_step+, has the same options as in +#run_upto+ method.
-  #
+  # 
   def run!( upto: target_time, final_step: :exact )
     run_upto( upto, final_step: final_step )
   end

data/lib/y_petri/transition.rb

@@ -101,6 +101,8 @@ class YPetri::Transition
 
   class << self
     ★ YPetri::World::Dependency
+
+    private :new
   end
 
   TYPES = {

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.7"
+  VERSION = "2.1.9"
   DEBUG = false
 end

data/lib/y_petri/world/dependency.rb

@@ -1,8 +1,8 @@
-#encoding: utf-8
+# encoding: utf-8
 
 # Provides basic skeleton for dependency injection for the triples of the
 # parametrized subclasses of Place, Transition and Net in different workspaces.
-#
+# 
 class YPetri::World
   module Dependency
     delegate :Place, :Transition, :Net, to: :world

data/lib/y_petri/world/petri_net_related.rb

@@ -13,19 +13,19 @@ module YPetri::World::PetriNetRelated
 
   # Returns a place instance identified by the argument.
   # 
-  def place id
+  def place( id )
     Place().instance( id )
   end
 
   # Returns a transition instance identified by the argument.
   # 
-  def transition id
+  def transition( id )
     Transition().instance( id )
   end
 
   # Returns a net instance identified by the argument.
   # 
-  def net id
+  def net( id )
     Net().instance( id )
   end
 
@@ -52,10 +52,10 @@ module YPetri::World::PetriNetRelated
   # Creates all-encompassing Net instance named :Top.
   # 
   def set_up_Top_net
-    Net().new name: :Top # all-encompassing :Top net
+    Net().send :new, name: :Top # all-encompassing :Top net
     # Hook new places to add themselves magically to the :Top net.
     Place().new_instance_closure { |new_inst| net( :Top ) << new_inst }
     # Hook new transitions to add themselves magically to the :Top net.
-    Transition().new_instance_closure { |new_inst| net( :Top ) << new_inst }    
+    Transition().new_instance_closure { |new_inst| net( :Top ) << new_inst }
   end
 end # module YPetri::World::PetriNetRelated

data/lib/y_petri/world.rb

@@ -4,11 +4,10 @@ require_relative 'world/dependency'
 require_relative 'world/petri_net_related'
 require_relative 'world/simulation_related'
 
-
 # As the name suggests, represents the world. Holds places, transitions, nets
 # and other assets needed to set up and simulate Petri nets (settings, clamps,
-# initial markings etc.). Provides basic methods to do what is necessary.
-# More ergonomic and DSL-like methods are up to the YPetri::Agent.
+# initial markings etc.). Provides basic methods to do what is necessary. More
+# ergonomic and DSL-like methods are up to the YPetri::Agent.
 # 
 class YPetri::World
   ★ NameMagic                        # ★ means include

data/test/net_test.rb

@@ -14,7 +14,7 @@ describe YPetri::Net do
   end
 
   it "should initialize" do
-    net = @w.Net.new
+    net = @w.Net.send :new
     net.places.must_equal []
     net.transitions.must_equal []
     net.pp.must_equal []
@@ -23,11 +23,11 @@ describe YPetri::Net do
 
   describe "element access" do
     before do
-      @net = @w.Net.new
+      @net = @w.Net.send :new
     end
 
     it "should be able to include places" do
-      p = @w.Place.new name: "A", quantum: 0.1, marking: 1.1
+      p = @w.Place.send :new, name: "A", quantum: 0.1, marking: 1.1
       @net.includes_place?( p ).must_equal false
       @net.include_place p
       @net.places.must_equal [ p ]
@@ -39,10 +39,10 @@ describe YPetri::Net do
 
   describe "world with 3 places" do
     before do
-      @p1 = @w.Place.new name: "A", quantum: 0.1, marking: 1.1
-      @p2 = @w.Place.new name: "B", quantum: 0.1, marking: 2.2
-      @p3 = @w.Place.new name: "C", quantum: 0.1, marking: 3.3
-      @p4 = @w.Place.new name: "X", marking: 0
+      @p1 = @w.Place.send :new, name: "A", quantum: 0.1, marking: 1.1
+      @p2 = @w.Place.send :new, name: "B", quantum: 0.1, marking: 2.2
+      @p3 = @w.Place.send :new, name: "C", quantum: 0.1, marking: 3.3
+      @p4 = @w.Place.send :new, name: "X", marking: 0
     end
 
     describe "net of 3 places and no transitions" do
@@ -59,7 +59,7 @@ describe YPetri::Net do
       it "should allow only right transitions to be included in it" do
         assert @net.include?( @p1 )
         assert ! @net.include?( @p4 )
-        t = @w.Transition.new s: { @p4 => -1 }
+        t = @w.Transition.send :new, s: { @p4 => -1 }
         -> { @net.include_transition t }.must_raise RuntimeError
       end
 
@@ -71,7 +71,7 @@ describe YPetri::Net do
       it "should be able to tell its qualities" do
         assert_equal false, @net.functional?
         assert_equal false, @net.timed?
-        assert @net.include?( @p1 ) && !@net.include?( YPetri::Place.new )
+        assert @net.include?( @p1 ) && !@net.include?( YPetri::Place.send :new )
       end
 
       it "should know its state and marking features" do
@@ -142,7 +142,7 @@ describe YPetri::Net do
 
         describe "plus 1 more nameless timeless functionless transition" do
           before do
-            @t2 = @w.Transition.new s: { @p2 => -1, @p3 => 1 }
+            @t2 = @w.Transition.send :new, s: { @p2 => -1, @p3 => 1 }
             @net.include_transition @t2
           end
 
@@ -189,7 +189,7 @@ end
 describe YPetri::Net::State do
   before do
     @w = YPetri::World.new
-    @net = @w.Net.new
+    @net = @w.Net.send :new
   end
 
   it "should be already parametrized on @w.Net" do

data/test/place_test.rb

@@ -1,5 +1,5 @@
 #! /usr/bin/ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 gem 'minitest', '=4.7.4'
 require 'minitest/autorun'

data/test/simulation_test.rb

@@ -13,7 +13,7 @@ describe YPetri::Simulation do
   end
 
   it "should allow for creation of an empty simulation" do
-    net = @w.Net.new
+    net = @w.Net.send :new
     sim = net.simulation
     sim.pp.must_equal []
     sim.pp( *[] ).must_equal []
@@ -23,8 +23,8 @@ describe YPetri::Simulation do
 
   describe "simulation setup" do
     before do
-      @p = @w.Place.new name: :A, default_marking: 1
-      @q = @w.Place.new name: :B, default_marking: 2
+      @p = @w.Place.send :new, name: :A, default_marking: 1
+      @q = @w.Place.send :new, name: :B, default_marking: 2
       @net = @w.Net.of @p, @q
     end
 
@@ -80,10 +80,10 @@ describe YPetri::Simulation do
 
     describe "transition representation aspects" do
       before do
-        @ts = @w.Transition.new name: "T_ts", codomain: :A, action: -> { 1 }
-        @tS = @w.Transition.new name: "T_tS", s: { B: -1, A: 1 }, action: proc { 1 }
-        @Ts = @w.Transition.new name: "T_Ts", codomain: :A, rate: -> { 1 }
-        @TS = @w.Transition.new name: "T_TS", s: { B: -1, A: 1 }, rate: proc { 1 }
+        @ts = @w.Transition.send :new, name: "T_ts", codomain: :A, action: -> { 1 }
+        @tS = @w.Transition.send :new, name: "T_tS", s: { B: -1, A: 1 }, action: proc { 1 }
+        @Ts = @w.Transition.send :new, name: "T_Ts", codomain: :A, rate: -> { 1 }
+        @TS = @w.Transition.send :new, name: "T_TS", s: { B: -1, A: 1 }, rate: proc { 1 }
       end
 
       it "should be what intended" do

data/test/transition_test.rb

@@ -25,33 +25,33 @@ describe ::YPetri::Transition do
         private :Place, :Transition
       }
     end
-    @p1 = pç.new default_marking: 1.0
-    @p2 = pç.new default_marking: 2.0
-    @p3 = pç.new default_marking: 3.0
-    @p4 = pç.new default_marking: 4.0
-    @p5 = pç.new default_marking: 5.0
+    @p1 = pç.send :new, default_marking: 1.0
+    @p2 = pç.send :new, default_marking: 2.0
+    @p3 = pç.send :new, default_marking: 3.0
+    @p4 = pç.send :new, default_marking: 4.0
+    @p5 = pç.send :new, default_marking: 5.0
   end
 
   describe "ts transitions (timeless nonstoichiometric)" do
     # Note: ts transitions require a function, and thus are always functional
     before do
-      @t1 = @ç.new codomain: [ @p1, @p3 ], domain: @p2, action: -> a { [ a, a ] }
-      @t2 = @ç.new codomain: [ @p1, @p3 ] do |t| [ t, t ] end
-      @t3 = @ç.new action: -> { [ 0.5, 0.5 ] }, codomain: [ @p1, @p3 ]
+      @t1 = @ç.send :new, codomain: [ @p1, @p3 ], domain: @p2, action: -> a { [ a, a ] }
+      @t2 = @ç.send :new, codomain: [ @p1, @p3 ] do |t| [ t, t ] end
+      @t3 = @ç.send :new, action: -> { [ 0.5, 0.5 ] }, codomain: [ @p1, @p3 ]
     end
 
     it "should raise errors for bad parameters" do
       # codomain omitted
-      -> { @ç.new domain: @p2, action: -> t { [ t, t ] } }
+      -> { @ç.send :new, domain: @p2, action: -> t { [ t, t ] } }
         .must_raise ArgumentError
       # mangled codomain
-      -> { @ç.new codomain: [ @p1, :a ], action: -> t { [ t, t ] } }
+      -> { @ç.send :new, codomain: [ @p1, :a ], action: -> t { [ t, t ] } }
         .must_raise TypeError
       # domain omitted
-      -> { @ç.new codomain: [ @p1, :a ], action: -> t { [ t, t ] } }
+      -> { @ç.send :new, codomain: [ @p1, :a ], action: -> t { [ t, t ] } }
         .must_raise TypeError
       # action closure arity greater than the domain
-      -> { @ç.new codomain: [ @p1, @p3 ], action: -> t { [ t, t ] }, domain: [] }
+      -> { @ç.send :new, codomain: [ @p1, @p3 ], action: -> t { [ t, t ] }, domain: [] }
         .must_raise TypeError
     end
 
@@ -77,8 +77,8 @@ describe ::YPetri::Transition do
 
   describe "tS transitions" do
     before do
-      @t1 = @ç.new s: { @p5 => -1, @p1 => 1 }, action: proc { 1 }
-      @t2 = @ç.new s: { @p5 => -1, @p1 => 1 } # should be "functionless"
+      @t1 = @ç.send :new, s: { @p5 => -1, @p1 => 1 }, action: proc { 1 }
+      @t2 = @ç.send :new, s: { @p5 => -1, @p1 => 1 } # should be "functionless"
     end
 
     it "should work" do
@@ -109,7 +109,7 @@ describe ::YPetri::Transition do
 
   describe "Ts transitions" do
     before do
-      @t1 = @ç.new domain: @p5, codomain: [@p5, @p1], rate: proc { [-1, 1] }
+      @t1 = @ç.send :new, domain: @p5, codomain: [@p5, @p1], rate: proc { [-1, 1] }
     end
 
     it "should work" do
@@ -128,12 +128,12 @@ describe ::YPetri::Transition do
   describe "TS transitions (timed stoichiometric)" do
     before do
       # This should give standard mass action by magic:
-      @TS1 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 }, rate: 0.1
+      @TS1 = @ç.send :new, s: { @p1 => -1, @p2 => -1, @p4 => 1 }, rate: 0.1
       # While this has custom closure:
-      @TS2 = @ç.new s: { @p1 => -1, @p3 => 1 }, rate: -> a { a * 0.5 }
+      @TS2 = @ç.send :new, s: { @p1 => -1, @p3 => 1 }, rate: -> a { a * 0.5 }
       # While this one even has domain explicitly specified:
-      @TS3 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 },
-                    upstream_arcs: @p3, rate: -> a { a * 0.5 }
+      @TS3 = @ç.send :new, s: { @p1 => -1, @p2 => -1, @p4 => 1 },
+                     upstream_arcs: @p3, rate: -> a { a * 0.5 }
     end
 
     it "should init and work" do
@@ -178,14 +178,14 @@ describe "upstream and downstream reference mτs of places and transitions" do
         private :Place, :Transition
       }
     }
-    @a = @pç.new( default_marking: 1.0 )
-    @b = @pç.new( default_marking: 2.0 )
-    @c = @pç.new( default_marking: 3.0 )
+    @a = @pç.send :new, default_marking: 1.0
+    @b = @pç.send :new, default_marking: 2.0
+    @c = @pç.send :new, default_marking: 3.0
   end
 
   describe "Place" do
     it "should have #register_ustream/downstream_transition methods" do
-      @t1 = @tç.new s: {}
+      @t1 = @tç.send :new, s: {}
       @a.instance_variable_get( :@upstream_arcs ).must_equal []
       @a.instance_variable_get( :@downstream_arcs ).must_equal []
       @a.send :register_upstream_transition, @t1
@@ -195,7 +195,7 @@ describe "upstream and downstream reference mτs of places and transitions" do
 
   describe "upstream and downstream reference methods" do
     before do
-      @t1 = @tç.new s: { @a => -1, @b => 1 }, rate: 1
+      @t1 = @tç.send :new, s: { @a => -1, @b => 1 }, rate: 1
     end
 
     it "should show on the referencers" do
@@ -209,8 +209,8 @@ describe "upstream and downstream reference mτs of places and transitions" do
 
   describe "assignment action transitions" do
     before do
-      @p = @pç.new default_marking: 1.0
-      @t = @tç.new codomain: @p, action: -> { 1 }, assignment_action: true
+      @p = @pç.send :new, default_marking: 1.0
+      @t = @tç.send :new, codomain: @p, action: -> { 1 }, assignment_action: true
     end
 
     it "should work" do

data/test/y_petri_test.rb

@@ -3,7 +3,7 @@
 
 gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
-require_relative '../lib/y_petri'     # tested component itself
+require_relative '../lib/y_petri' # tested component itself
 # require 'y_petri'
 # require 'sy'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.9
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: y_support