y_petri 2.0.15 → 2.1.3

data/test/transition_test.rb

@@ -1,5 +1,5 @@
 #! /usr/bin/ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -36,220 +36,124 @@ describe ::YPetri::Transition 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 ] }
-      # saying that the transition is timed saves the day here:
-      @t2 = @ç.new codomain: [ @p1, @p3 ], action: -> t { [ t, t ] }, timed: true
-      # Only when the domain is unary, is the closure allowed to be timeless:
-      @t3 = @ç.new codomain: [ @p1, @p3 ], action: -> t { [ t, t ] }, timed: false, domain: [ @p2 ]
-      # With nullary action closure, timeless is implied, so this is allowed
-      @t4 = @ç.new action: -> { [ 0.5, 0.5 ] }, codomain: [ @p1, @p3 ]
-      # ... also for stoichiometric variety
-      @t5 = @ç.new action: -> { 0.5 }, codomain: [ @p1, @p3 ], s: [ 1, 1 ]
+      @t2 = @ç.new codomain: [ @p1, @p3 ] do |t| [ t, t ] end
+      @t3 = @ç.new action: -> { [ 0.5, 0.5 ] }, codomain: [ @p1, @p3 ]
     end
 
     it "should raise errors for bad parameters" do
-      # omitting the domain should raise ArgumentError about too much ambiguity:
-      -> { @ç.new codomain: [ @p1, @p3 ], action: -> t { [ t, t ] } }
-        .must_raise ArgumentError
-      # saying that the transition is timeless points to a conflict:
-      -> { @ç.new codomain: [ @p1, @p3 ], action: -> t { [ t, t ] }, timeless: true }
+      # codomain omitted
+      -> { @ç.new domain: @p2, action: -> t { [ t, t ] } }
         .must_raise ArgumentError
+      # mangled codomain
+      -> { @ç.new codomain: [ @p1, :a ], action: -> t { [ t, t ] } }
+        .must_raise TypeError
+      # domain omitted
+      -> { @ç.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: [] }
+        .must_raise TypeError
     end
 
-    it "should initialize and perform" do
+    it "should work" do
+      @t1.type.must_equal :ts
       @t1.domain.must_equal [@p2]
       @t1.action_arcs.must_equal [@p1, @p3]
       assert @t1.functional?
-      assert @t1.timeless?
-      assert @t2.timed?
-      assert [@t3, @t4, @t5].all? { |t| t.timeless? }
-      assert @t2.rateless?
+      assert [@t1, @t2, @t3].all? { |t| t.timeless? }
+      assert [@t1, @t2, @t3].all? { |t| t.s? }
       # Now let's flex them:
       @t1.fire!
       [@p1.m, @p3.m].must_equal [3, 5]
       @t3.fire!
-      [@p1.m, @p3.m].must_equal [5, 7]
-      @t4.fire!
-      [@p1.m, @p3.m].must_equal [5.5, 7.5]
-      @t5.fire!
-      [@p1.m, @p3.m].must_equal [6, 8]
-      # now t2 for firing requires delta time
-      @t2.fire! 1
-      [@p1.m, @p3.m].must_equal [7, 9]
-      @t2.fire! 0.1
-      [@p1.m, @p3.m ].must_equal [7.1, 9.1]
-      # let's change @p2 marking
-      @p2.m = 0.1
-      @t1.fire!
-      assert_in_epsilon 7.2, @p1.marking, 1e-9
-      assert_in_epsilon 9.2, @p3.marking, 1e-9
-      # let's test #domain_marking, #codomain_marking, #zero_action
+      [@p1.m, @p3.m].must_equal [3.5, 5.5]
+      @t2.fire!
+      [@p1.m, @p3.m].must_equal [7.0, 9.0]
       @t1.codomain_marking.must_equal [@p1.m, @p3.m]
       @t1.domain_marking.must_equal [@p2.m]
       @t1.zero_action.must_equal [0, 0]
     end
   end
 
-  describe "Tsr transitions (timed rateless non-stoichiometric)" do
-    #LATER: To save time, I omit the full test suite.
-  end
-
-  describe "tS transitions (timeless stoichiometric)" do
-    describe "functionless tS transitions" do
-      # For functionless tS transitions, stoichiometric vector must be given,
-      # from which the action closure is then generated.
-
-      before do
-        # tS transition with only stoichiometric vector, as hash
-        @ftS1 = @ç.new stoichiometry: { @p1 => 1 }
-        # tS transition with only stoichiometric vector, as array + codomain
-        @ftS2 = @ç.new stoichiometry: 1, codomain: @p1
-        # :stoichiometry keyword is aliased as :s
-        @ftS3 = @ç.new s: 1, codomain: @p1
-        # :codomain is aliased as :action_arcs
-        @ftS4 = @ç.new s: 1, action_arcs: @p1
-        # square brackets (optional for size 1 vectors)
-        @ftS5 = @ç.new s: [ 1 ], downstream: [ @p1 ]
-        # another alias of :codomain is :downstream_places
-        @ftS6 = @ç.new s: [ 1 ], downstream_places: [ @p1 ]
-        # And now, collect all of the above:
-        @tt = @ftS1, @ftS2, @ftS3, @ftS4, @ftS5, @ftS6
-      end
-
-      it "should work" do
-        # ...should be the same, having a single action arc:
-        assert @tt.all? { |t| t.action_arcs == [@p1] }
-        # timeless:
-        assert @tt.all? { |t| t.timeless? }
-        # rateless:
-        assert @tt.all? { |t| t.rateless? }
-        assert @tt.all? { |t| not t.has_rate? }
-        # no assignment action
-        assert @tt.all? { |t| not t.assignment_action? }
-        # not considered functional
-        assert @tt.all? { |t| t.functionless? }
-        assert @tt.all? { |t| not t.functional? }
-        # and having nullary action closure
-        assert @tt.all? { |t| t.action_closure.arity == 0 }
-        # the transitions should be able to #fire!
-        @ftS1.fire!
-        # the difference is apparent: marking of place @p1 jumped to 2:
-        @p1.marking.must_equal 2
-        # but should not #fire (no exclamation mark) unless cocked
-        assert !@ftS1.cocked?
-        @ftS1.fire
-        @p1.marking.must_equal 2
-        # cock it
-        @ftS1.cock
-        assert @ftS1.cocked?
-        # uncock again, just to test cocking
-        @ftS1.uncock
-        assert @ftS1.uncocked?
-        @ftS1.cock
-        assert !@ftS1.uncocked?
-        @ftS1.fire
-        @p1.marking.must_equal 3
-        # enough playing, we'll reset @p1 marking
-        @p1.reset_marking
-        @p1.marking.must_equal 1
-        # #action
-        assert @tt.all? { |t| t.action == [1] }
-        # #zero_action
-        assert @tt.all? { |t| t.zero_action }
-        # #domain_marking
-        assert @tt.all? { |t| t.domain_marking == [] }
-        # #codomain_marking
-        assert @tt.all? { |t| t.codomain_marking == [@p1.m] }
-        # #enabled?
-        @p1.m.must_equal 1
-        @p1.guard.( 1 ).must_equal 1
-        @tt.each { |t| t.enabled?.must_equal true }
-      end
+  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"
     end
 
-    describe "functional tS transitions" do
-      # Closure supplied to tS transitions governs their action.
-
-      before do
-        # stoichiometry given as hash
-        @FtS1 = @ç.new action_closure: ->{ 1 }, s: { @p1 => 1 }
-        # :action_closure has alias :action
-        @FtS2 = @ç.new action: ->{ 1 }, s: { @p1 => 1 }
-        # stoichiometry given as array of coefficients + codomain
-        @FtS3 = @ç.new s: 1, codomain: @p1, action: ->{ 1 }
-        # Specifying +timed: false+ as well as +timeless: true+ should be OK.
-        @FtS4 = @ç.new s: { @p1 => 1 }, action: ->{ 1 }, timed: false
-        @FtS5 = @ç.new s: { @p1 => 1 }, action: ->{ 1 }, timeless: true
-        # Even together in one statement:
-        @FtS6 = @ç.new s: { @p1 => 1 }, action: ->{ 1 }, timed: false, timeless: true
-        @tt = @FtS1, @FtS2, @FtS3, @FtS4, @FtS5, @FtS6
-      end
-
-      it "should reject bad parameters" do
-        # # +timed: true+ should raise a complaint:
-        # -> { @ç.new s: { @p1 => 1 }, action: ->{ 1 }, timed: true }
-        #   .must_raise ArgumentError # constraint relaxed?
-      end
-
-      it "should init and perform" do
-        assert @tt.all? { |t| t.action_arcs == [ @p1 ] }
-        assert @tt.all? { |t| t.timeless? }
-        assert @tt.all? { |t| not t.has_rate? }
-        assert @tt.all? { |t| t.rateless? }
-        assert @tt.all? { |t| not t.assignment_action? }
-        assert @tt.all? { |t| not t.functionless? }
-        assert @tt.all? { |t| t.functional? }
-        # and having nullary action closure
-        assert @tt.all? { |t| t.action_closure.arity == 0 }
-        # the transitions should be able to #fire!
-        @FtS1.fire!
-        # no need for more testing here
-      end
+    it "should work" do
+      @t1.type.must_equal :tS
+      @t2.type.must_equal :tS
+      @t1.codomain.must_equal [@p5, @p1]
+      @t2.codomain.must_equal [@p5, @p1]
+      assert @t1.functional?
+      assert ! @t2.functional? # "functionless"
+      assert ! @t1.timed?
+      assert ! @t2.timed?
+      @t1.stoichiometry.must_equal [-1, 1]
+      @t2.stoichiometry.must_equal [-1, 1]
+      @t1.stoichio.must_equal( { @p5 => -1, @p1 => 1 } )
+      @t2.stoichio.must_equal( { @p5 => -1, @p1 => 1 } )
+      @t1.s.must_equal( { @p5.object_id => -1, @p1.object_id => 1 } ) 
+      @t2.s.must_equal( { @p5.object_id => -1, @p1.object_id => 1 } )
+      @t1.domain.must_equal [@p5] # inferred domain
+      @t2.domain.must_equal [] # domain is empty in functionless transitions!
+      [@p1.m, @p5.m].must_equal [1, 5]
+      @t1.fire!
+      [@p1.m, @p5.m].must_equal [2, 4]
+      @t2.fire!
+      [@p1.m, @p5.m].must_equal [3, 3]
     end
   end
 
-  describe "TSr transitions (timed rateless stoichiometric)" do
-    # Sr transitions have an action closure, require a function block, and thus
-    # are always functional. Their closure must take Δt as its first argument.
-
-    #LATER: To save time, I omit the tests of TSr transitions for now.
-  end
 
-  describe "sR transitions (nonstoichiometric with rate)" do
-    # Expect a function block with arity equal to their domain size, and output
-    # arity equal to the codomain size.
+  describe "Ts transitions" do
+    before do
+      @t1 = @ç.new domain: @p5, codomain: [@p5, @p1], rate: proc { [-1, 1] }
+    end
 
-    #LATER: To save time, I omit the full test suite.
+    it "should work" do
+      @t1.type.must_equal :Ts
+      @t1.codomain.must_equal [@p5, @p1]
+      assert @t1.functional?
+      assert @t1.timed?
+      @t1.domain.must_equal [@p5]
+      [@p1.m, @p5.m].must_equal [1, 5]
+      @t1.rate_closure.arity.must_equal 0
+      @t1.fire! 0.5
+      [@p1.m, @p5.m].must_equal [1.5, 4.5]
+    end
   end
 
-  describe "SR transitions (stoichiometric with rate)" do
+  describe "TS transitions (timed stoichiometric)" do
     before do
       # This should give standard mass action by magic:
-      @SR1 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 }, rate: 0.1
+      @TS1 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 }, rate: 0.1
       # While this has custom closure:
-      @SR2 = @ç.new s: { @p1 => -1, @p3 => 1 }, rate: -> a { a * 0.5 }
+      @TS2 = @ç.new s: { @p1 => -1, @p3 => 1 }, rate: -> a { a * 0.5 }
       # While this one even has domain explicitly specified:
-      @SR3 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 },
+      @TS3 = @ç.new s: { @p1 => -1, @p2 => -1, @p4 => 1 },
                     upstream_arcs: @p3, rate: -> a { a * 0.5 }
     end
 
     it "should init and work" do
-      @SR1.has_rate?.must_equal true
-      @SR1.upstream_arcs.must_equal [@p1, @p2]
-      @SR1.action_arcs.must_equal [@p1, @p2, @p4]
-      @SR2.domain.must_equal [@p1]
-      @SR2.action_arcs.must_equal [@p1, @p3]
-      @SR3.domain.must_equal [@p3]
-      @SR3.action_arcs.must_equal [@p1, @p2, @p4]
+      @TS1.timed?.must_equal true
+      @TS1.upstream_arcs.must_equal [@p1, @p2]
+      @TS1.action_arcs.must_equal [@p1, @p2, @p4]
+      @TS2.domain.must_equal [@p1]
+      @TS2.action_arcs.must_equal [@p1, @p3]
+      @TS3.domain.must_equal [@p3]
+      @TS3.action_arcs.must_equal [@p1, @p2, @p4]
       # and flex them
-      @SR1.fire! 1.0
+      @TS1.fire! 1.0
       [@p1, @p2, @p4].map( &:marking ).must_equal [0.8, 1.8, 4.2]
-      @SR2.fire! 1.0
+      @TS2.fire! 1.0
       [@p1, @p3].map( &:marking ).must_equal [0.4, 3.4]
       # the action t3 cannot fire with delta time 1.0
-      -> { @SR3.fire! 1.0 }.must_raise YPetri::GuardError
+      -> { @TS3.fire! 1.0 }.must_raise YPetri::GuardError
       [@p1, @p2, @p3, @p4].map( &:marking ).must_equal [0.4, 1.8, 3.4, 4.2]
       # but it can fire with eg. delta time 0.1
-      @SR3.fire! 0.1
+      @TS3.fire! 0.1
       assert_in_epsilon 0.23, @p1.marking, 1e-15
       assert_in_epsilon 1.63, @p2.marking, 1e-15
       assert_in_epsilon 3.4, @p3.marking, 1e-15
@@ -265,7 +169,6 @@ end
 #
 describe "upstream and downstream reference mτs of places and transitions" do
   before do
-    # skip "to speed up testing"
     @tç = tç = Class.new YPetri::Transition
     @pç = pç = Class.new YPetri::Place
     [ tç, pç ].each { |ç|

data/test/world_mock.rb

@@ -0,0 +1,12 @@
+WORLD_MOCK = -> do
+  w = YPetri::World.new
+  [ w.Place, w.Transition, w.Net ].tap do |p, t, _|
+    def p.nw( n, *args, &block )
+      new( *args ).tap { |i| i.name = n }
+    end
+
+    def t.nw( n, *args, &block )
+      new( *args ).tap { |i| i.name = n }
+    end
+  end
+end

data/test/{workspace_test.rb → world_test.rb}

@@ -1,5 +1,5 @@
 #! /usr/bin/ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -9,34 +9,32 @@ require_relative '../lib/y_petri'     # tested component itself
 
 include Pyper if require 'pyper'
 
-describe YPetri::Workspace do
+describe YPetri::World do
   before do
-    @w = YPetri::Workspace.new
-    a = @w.Place.new!( default_marking: 1.0, name: "AA" )
-    b = @w.Place.new!( default_marking: 2.0, name: "BB" )
-    c = @w.Place.new!( ɴ: "CC", default_marking: 3.0 )
-    t1 = @w.Transition.new! s: { a => -1, b => -1, c => 1 },
+    @w = YPetri::World.new
+    a = @w.Place.avid( default_marking: 1.0, name: "AA" )
+    b = @w.Place.avid( default_marking: 2.0, name: "BB" )
+    c = @w.Place.avid( ɴ: "CC", default_marking: 3.0 )
+    t1 = @w.Transition.avid s: { a => -1, b => -1, c => 1 },
                             rate: 0.1,
                             ɴ: "AA_BB_assembly"
-    t2 = @w.Transition.new! ɴ: "AA_appearing",
+    t2 = @w.Transition.avid ɴ: "AA_appearing",
                             codomain: a,
                             rate: -> { 0.1 },
                             stoichiometry: 1
     @pp, @tt = [a, b, c], [t1, t2]
     @f_name = "test_output.csv"
-    @w.set_imc @pp.τBᴍHτ( &:default_marking )
+    @w.set_imc @pp >> @pp.map( &:default_marking )
     @w.set_ssc step: 0.1, sampling: 10, time: 0..50
     @w.set_cc( {} )
-    @sim = @w.new_timed_simulation
+    @sim = @w.new_simulation
     File.delete @f_name rescue nil
   end
 
   it "should present places, transitions, nets, simulations" do
     assert_kind_of YPetri::Net, @w.Net::Top
     assert_equal @pp[0], @w.place( "AA" )
-    assert_equal :AA, @w.pl( @pp[0] )
     assert_equal @tt[0], @w.transition( "AA_BB_assembly" )
-    assert_equal :AA_appearing, @w.tr( @tt[1] )
     assert_equal @pp, @w.places
     assert_equal @tt, @w.transitions
     assert_equal 1, @w.nets.size
@@ -48,25 +46,26 @@ describe YPetri::Workspace do
     assert_equal [:Base], @w.clamp_collections.keys
     assert_equal [:Base], @w.initial_marking_collections.keys
     assert_equal [:Base], @w.simulation_settings_collections.keys
-    assert_equal [:AA, :BB, :CC], @w.pp
-    assert_equal [:AA_BB_assembly, :AA_appearing], @w.tt
-    assert_equal [:Top], @w.nn
+    assert_equal [:AA, :BB, :CC], @w.places.names
+    assert_equal [:AA_BB_assembly, :AA_appearing], @w.transitions.names
+    assert_equal [:Top], @w.nets.names
   end
 
   it "should simulate" do
     assert_equal 1, @w.simulations.size
     assert_kind_of( YPetri::Simulation, @w.simulation )
-    assert_equal 2, @w.simulation.SR_transitions.size
+    assert_equal 2, @w.simulation.TS_tt.size
     @tt[0].domain.must_equal [ @pp[0], @pp[1] ]
     @tt[1].domain.must_equal []
-    assert_equal [0.2, 0.1], @w.simulation.φ.column_to_a
+    assert @w.simulation.timed?
+    assert_equal [0.2, 0.1], @w.simulation.flux_vector.column_to_a
     @w.simulation.step!
     @w.simulation.run!
-    rec_string = @w.simulation.recording_csv_string
-    expected_recording_string =
+    rec_csv = @w.simulation.recording.to_csv
+    expected_rec_csv =
       "0.0,1.0,2.0,3.0\n" +
       "10.0,0.86102,0.86102,4.13898\n" +
       "20.0,1.29984,0.29984,4.70016\n"
-    assert rec_string.start_with?( expected_recording_string )
+    rec_csv.to_s[0, expected_rec_csv.size].must_equal expected_rec_csv
   end
 end

data/test/y_petri_test.rb

@@ -1,5 +1,5 @@
 #! /usr/bin/ruby
-# -*- coding: utf-8 -*-
+# encoding: utf-8
 
 require 'minitest/spec'
 require 'minitest/autorun'
@@ -11,7 +11,7 @@ require_relative '../lib/y_petri'     # tested component itself
 # 
 describe YPetri do
   it "should have basic classes" do
-    [ :Place, :Transition, :Net, :Simulation, :Workspace, :Manipulator ]
+    [ :Place, :Transition, :Net, :Simulation, :World, :Agent ]
       .each { |ß| YPetri.const_get( ß ).must_be_kind_of Module }
   end
 end
@@ -22,6 +22,5 @@ require_relative 'place_test'
 require_relative 'transition_test'
 require_relative 'net_test'
 require_relative 'simulation_test'
-require_relative 'timed_simulation_test'
-require_relative 'workspace_test'
-require_relative 'manipulator_test'
+require_relative 'world_test'
+require_relative 'agent_test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.1.3
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: y_support
@@ -65,51 +65,120 @@ files:
 - README.md
 - Rakefile
 - lib/y_petri.rb
-- lib/y_petri/demonstrator.rb
-- lib/y_petri/demonstrator_2.rb
-- lib/y_petri/demonstrator_3.rb
-- lib/y_petri/demonstrator_4.rb
-- lib/y_petri/dependency_injection.rb
-- lib/y_petri/manipulator.rb
-- lib/y_petri/manipulator/hash_key_pointer.rb
-- lib/y_petri/manipulator/petri_net_related_methods.rb
-- lib/y_petri/manipulator/selection.rb
-- lib/y_petri/manipulator/simulation_related_methods.rb
+- lib/y_petri/agent.rb
+- lib/y_petri/agent/hash_key_pointer.rb
+- lib/y_petri/agent/petri_net_related.rb
+- lib/y_petri/agent/selection.rb
+- lib/y_petri/agent/simulation_related.rb
+- lib/y_petri/core.rb
+- lib/y_petri/core/timed.rb
+- lib/y_petri/core/timed/euler.rb
+- lib/y_petri/core/timed/pseudo_euler.rb
+- lib/y_petri/core/timed/quasi_euler.rb
+- lib/y_petri/core/timeless.rb
+- lib/y_petri/core/timeless/pseudo_euler.rb
+- lib/y_petri/dsl.rb
+- lib/y_petri/fixed_assets.rb
 - lib/y_petri/net.rb
-- lib/y_petri/net/selections.rb
+- lib/y_petri/net/element_access.rb
+- lib/y_petri/net/state.rb
+- lib/y_petri/net/state/feature.rb
+- lib/y_petri/net/state/feature/delta.rb
+- lib/y_petri/net/state/feature/firing.rb
+- lib/y_petri/net/state/feature/flux.rb
+- lib/y_petri/net/state/feature/gradient.rb
+- lib/y_petri/net/state/feature/marking.rb
+- lib/y_petri/net/state/features.rb
+- lib/y_petri/net/state/features/dataset.rb
+- lib/y_petri/net/state/features/record.rb
+- lib/y_petri/net/timed.rb
 - lib/y_petri/net/visualization.rb
 - lib/y_petri/place.rb
 - lib/y_petri/place/arcs.rb
 - lib/y_petri/place/guard.rb
 - lib/y_petri/simulation.rb
-- lib/y_petri/simulation/collections.rb
+- lib/y_petri/simulation/dependency.rb
+- lib/y_petri/simulation/element_representation.rb
+- lib/y_petri/simulation/elements.rb
+- lib/y_petri/simulation/elements/access.rb
+- lib/y_petri/simulation/feature_set.rb
+- lib/y_petri/simulation/initial_marking.rb
+- lib/y_petri/simulation/initial_marking/access.rb
+- lib/y_petri/simulation/marking_clamps.rb
+- lib/y_petri/simulation/marking_clamps/access.rb
+- lib/y_petri/simulation/marking_vector.rb
+- lib/y_petri/simulation/marking_vector/access.rb
+- lib/y_petri/simulation/matrix.rb
+- lib/y_petri/simulation/place_mapping.rb
+- lib/y_petri/simulation/place_representation.rb
+- lib/y_petri/simulation/places.rb
+- lib/y_petri/simulation/places/access.rb
+- lib/y_petri/simulation/places/clamped.rb
+- lib/y_petri/simulation/places/free.rb
+- lib/y_petri/simulation/places/types.rb
+- lib/y_petri/simulation/recorder.rb
 - lib/y_petri/simulation/timed.rb
+- lib/y_petri/simulation/timed/recorder.rb
+- lib/y_petri/simulation/timeless.rb
+- lib/y_petri/simulation/timeless/recorder.rb
+- lib/y_petri/simulation/transition_representation.rb
+- lib/y_petri/simulation/transition_representation/A.rb
+- lib/y_petri/simulation/transition_representation/S.rb
+- lib/y_petri/simulation/transition_representation/T.rb
+- lib/y_petri/simulation/transition_representation/TS.rb
+- lib/y_petri/simulation/transition_representation/Ts.rb
+- lib/y_petri/simulation/transition_representation/a.rb
+- lib/y_petri/simulation/transition_representation/s.rb
+- lib/y_petri/simulation/transition_representation/t.rb
+- lib/y_petri/simulation/transition_representation/tS.rb
+- lib/y_petri/simulation/transition_representation/ts.rb
+- lib/y_petri/simulation/transition_representation/types.rb
+- lib/y_petri/simulation/transitions.rb
+- lib/y_petri/simulation/transitions/A.rb
+- lib/y_petri/simulation/transitions/S.rb
+- lib/y_petri/simulation/transitions/T.rb
+- lib/y_petri/simulation/transitions/TS.rb
+- lib/y_petri/simulation/transitions/Ts.rb
+- lib/y_petri/simulation/transitions/a.rb
+- lib/y_petri/simulation/transitions/access.rb
+- lib/y_petri/simulation/transitions/s.rb
+- lib/y_petri/simulation/transitions/t.rb
+- lib/y_petri/simulation/transitions/tS.rb
+- lib/y_petri/simulation/transitions/ts.rb
+- lib/y_petri/simulation/transitions/types.rb
 - lib/y_petri/transition.rb
 - lib/y_petri/transition/arcs.rb
 - lib/y_petri/transition/assignment.rb
 - lib/y_petri/transition/cocking.rb
 - lib/y_petri/transition/construction.rb
+- lib/y_petri/transition/init.rb
 - lib/y_petri/transition/ordinary_timeless.rb
 - lib/y_petri/transition/timed.rb
 - lib/y_petri/version.rb
-- lib/y_petri/workspace.rb
-- lib/y_petri/workspace/parametrized_subclassing.rb
-- lib/y_petri/workspace/petri_net_related_methods.rb
-- lib/y_petri/workspace/simulation_related_methods.rb
+- lib/y_petri/world.rb
+- lib/y_petri/world/dependency.rb
+- lib/y_petri/world/petri_net_related.rb
+- lib/y_petri/world/simulation_related.rb
 - test/acceptance/basic_usage_test.rb
 - test/acceptance/simulation_test.rb
 - test/acceptance/simulation_with_physical_units_test.rb
 - test/acceptance/token_game_test.rb
 - test/acceptance/visualization_test.rb
 - test/acceptance_tests.rb
-- test/manipulator_test.rb
-- test/manual_examples.rb
+- test/agent_test.rb
+- test/examples/demonstrator.rb
+- test/examples/demonstrator_2.rb
+- test/examples/demonstrator_3.rb
+- test/examples/demonstrator_4.rb
+- test/examples/example_2.rb
+- test/examples/manual_examples.rb
 - test/net_test.rb
 - test/place_test.rb
+- test/sim_test
 - test/simulation_test.rb
-- test/timed_simulation_test.rb
 - test/transition_test.rb
-- test/workspace_test.rb
+- test/world_mock.rb
+- test/world_test.rb
 - test/y_petri_test.rb
 - y_petri.gemspec
 homepage: ''
@@ -142,12 +211,18 @@ test_files:
 - test/acceptance/token_game_test.rb
 - test/acceptance/visualization_test.rb
 - test/acceptance_tests.rb
-- test/manipulator_test.rb
-- test/manual_examples.rb
+- test/agent_test.rb
+- test/examples/demonstrator.rb
+- test/examples/demonstrator_2.rb
+- test/examples/demonstrator_3.rb
+- test/examples/demonstrator_4.rb
+- test/examples/example_2.rb
+- test/examples/manual_examples.rb
 - test/net_test.rb
 - test/place_test.rb
+- test/sim_test
 - test/simulation_test.rb
-- test/timed_simulation_test.rb
 - test/transition_test.rb
-- test/workspace_test.rb
+- test/world_mock.rb
+- test/world_test.rb
 - test/y_petri_test.rb

data/lib/y_petri/dependency_injection.rb

@@ -1,45 +0,0 @@
-#encoding: utf-8
-
-# Provides basic skeleton for dependency injection for the triples of the
-# parametrized subclasses of Place, Transition and Net in different workspaces.
-#
-module YPetri::DependencyInjection
-
-  private
-
-  # Place class -- to be overriden in subclasses for dependency injection.
-  # 
-  def Place
-    YPetri::Place
-  end
-
-  # Transition class -- to be overriden in subclasses for dependency injection.
-  # 
-  def Transition
-    YPetri::Transition
-  end
-
-  # Net class -- to be overriden in subclasses for dependency injection
-  # 
-  def Net
-    YPetri::Net
-  end
-
-  # Place instance identification.
-  # 
-  def place id
-    Place().instance( id )
-  end
-
-  # Transition instance identification.
-  # 
-  def transition id
-    Transition().instance( id )
-  end
-
-  # Net instance identification.
-  # 
-  def net id
-    Net().instance( id )
-  end
-end # module YPetri::DependencyInjection