y_petri 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7a7b5033fa23e8fbdaee627d1864722a31f850
-  data.tar.gz: b17971ab72080978c0877a281e6a22fd7dcef2df
+  metadata.gz: 06d8f9b1a6908fc67194dfd3191b23507f464902
+  data.tar.gz: 48003b2be2c2ec91037fff8da8af9105db5a2e1a
 SHA512:
-  metadata.gz: df9453ff5bd03c744158b2d8f848c7700ea3cdc80f0c3eb6fb64c409a0436eb7bae5e7538ed86f96c3e759acd4b68c79d9b07cc0045bad0718d0ae7ea5d761ea
-  data.tar.gz: dd0569b0b5a0b402a78b1130b7805d3d8202ccd8219ddcdb35a18c7a10f4c479d12b4e4216f1a6c8cce84ff314ce18d228ab803e2f89d785682719d517901c2e
+  metadata.gz: 36b5c04eba5b0890245f665d2275aa27668e8bec8080cf26b211e4b061302a7358bf7537b41d1acb9c81ea841680cb0b56075e170f79c78b34de77dbddffb88a
+  data.tar.gz: 7bed185007a8c5cbc55da85f8e654678a359c3f7d8157c8abe651f8d6735b1950e90e62bcbff2f1eb0323ebd747c487d7e6e4f60d7f94c0961c5eea55580a74a

data/lib/y_petri.rb

@@ -6,10 +6,8 @@ require 'y_support/respond_to'         # Symbol#~@ + RespondTo#===
 require 'y_support/name_magic'         # naming by assignment & more
 require 'y_support/unicode'            # ç means self.class
 require 'y_support/typing'             # run-time assertions
-require 'y_support/try'                # increased awareness in danger
 require 'y_support/core_ext'           # core extensions
 require 'y_support/stdlib_ext/matrix'  # matrix extensions
-require 'y_support/abstract_algebra'   # 
 require 'y_support/kde'                # popup file with kioclient
 
 # ActiveSupport components:

data/lib/y_petri/agent/petri_net_aspect.rb

@@ -153,7 +153,7 @@ module YPetri::Agent::PetriNetAspect
 
   # Sets the net point to a given net, or to world.Net::Top if none given.
   # 
-  def net_point_reset id=world.Net::Top
+  def net_point_reset id=world.Net.instance( :Top )
     @net_point = world.net( id )
   end
 

data/lib/y_petri/place/guard.rb

@@ -6,7 +6,7 @@ class YPetri::Place::Guard
   # Error message template.
   # 
   ERRMSG = -> m, of, assert do
-    "Marking #{m.insp}" +
+    "Marking #{m.y_inspect}" +
       if of then " of #{of.name || of}" else '' end +
       " #{assert}!"
   end

data/lib/y_petri/simulation/timed.rb

@@ -240,7 +240,12 @@ module YPetri::Simulation::Timed
       when Range then
         time_range = settings[:time]
         @initial_time, @target_time = time_range.begin, time_range.end
-        @time_unit = initial_time.class.one
+        @time_unit = case initial_time
+                     when Float then 1.0
+                     when Integer then 1
+                     else
+                       initial_time.class.one
+                     end
       else
         # TODO: When using simulation after some time, I found this behavior
         # surprising. I wanted to call simulation time: 100, expecting it
@@ -261,7 +266,12 @@ module YPetri::Simulation::Timed
         # users can always modify time later (simulation.time = something).
         # 
         @initial_time = settings[:time]
-        @time_unit = initial_time.class.one
+        @time_unit = case initial_time
+                     when Float then 1.0
+                     when Integer then 1
+                     else
+                       initial_time.class.one
+                     end
         @target_time = time_unit * Float::INFINITY
       end
     else
@@ -269,7 +279,12 @@ module YPetri::Simulation::Timed
       msg = "The simulation is timed, but the constructor lacks any of the " +
         "time-related arguments: :time, :step, or :sampling!"
       fail ArgumentError, msg unless anything
-      @time_unit = anything.class.one
+      @time_unit = case anything
+                   when Float then 1.0
+                   when Integer then 1
+                   else
+                     anything.class.one
+                   end
       @initial_time, @target_time = time_unit * 0, time_unit * Float::INFINITY
     end
     # Set up a parametrized subclas of the sampler for timed simulation.

data/lib/y_petri/transition/A.rb

@@ -19,15 +19,13 @@ module YPetri::Transition::Type_A
   # Assigns the action closure result to the codomain, regardless of cocking.
   # 
   def fire!
-    consciously "to #fire!" do
-      act = note "action", is: Array( action )
-      msg = "Wrong output arity of the action closure of #{self}"
-      fail TypeError, msg if act.size != codomain.size
-      codomain.each_with_index { |p, i|
-        note "assigning action node no. #{i} to #{p}"
-        p.marking = note "marking to assign", is: act.fetch( i )
-      }
-    end
+    act = Array( action )
+    fail TypeError, "Wrong output arity of the action " +
+      "closure of #{self}" if act.size != codomain.size
+    codomain.each_with_index { |place, index|
+      # assigning action node no. index to place
+      place.marking = act.fetch( index )
+    }
     return nil
   end
 

data/lib/y_petri/transition/T.rb

@@ -25,14 +25,12 @@ module YPetri::Transition::Type_T
   # Δt as an argument.
   # 
   def fire! Δt
-    consciously "call #fire method" do
-      act = note "action", is: Array( action Δt )
-      msg = "Wrong output arity of the action closure of #{self}!"
-      fail TypeError, msg if act.size != codomain.size
-      codomain.each_with_index do |p, i|
-        note "adding action node no. #{i} to #{p}"
-        p.add note( "marking change", is: act.fetch( i ) )
-      end
+    action = Array( action Δt )
+    fail TypeError, "Wrong output arity of the action " +
+      "closure of #{self}!" if action.size != codomain.size
+    codomain.each_with_index do |place, index|
+      # Adding action place no. index to place"
+      place.add action.fetch( index )
     end
     return nil
   end

data/lib/y_petri/transition/t.rb

@@ -24,14 +24,12 @@ module YPetri::Transition::Type_t
   # Fires the transition regardless of cocking.
   # 
   def fire!
-    consciously "call #fire method" do
-      act = Array( action )
-      msg = "Wrong output arity of the action closure of #{self}!"
-      fail TypeError, msg if act.size != codomain.size
-      codomain.each_with_index do |p, i|
-        note "adding action node no. #{i} to #{p}"
-        p.add note( "marking change", is: act.fetch( i ) )
-      end
+    act = Array( action )
+    fail TypeError, "Wrong output arity of the action " +
+      "closure of #{self}!" if act.size != codomain.size
+    codomain.each_with_index do |place, index|
+      # adding action node no. index to place
+      place.add act.fetch( index )
     end
     return nil
   end

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
   DEBUG = false
 end

data/lib/y_petri/world/simulation_aspect.rb

@@ -282,7 +282,7 @@ module YPetri::World::SimulationAspect
             settings.may_have :cc, syn!: :clamp_collection
             settings.may_have :imc, syn!: :initial_marking_collection
             settings.may_have :ssc, syn!: :simulation_settings_collection
-            { net:  net( settings[:net] || self.Net::Top ), # the key
+            { net:  net( settings[:net] || self.Net.instance( :Top ) ), # the key
               cc:   settings[:cc]       || :Base,
               imc:  settings[:imc]      || :Base,
               ssc:  settings[:ssc]      || :Base }

data/test/agent_test.rb

@@ -15,7 +15,7 @@ describe YPetri::Agent do
     # --- net point related assets ---
     @m.net_point_reset
     @m.net_point_reset @m.world.net( :Top )
-    @m.net.must_equal @m.world.Net::Top
+    @m.net.must_equal @m.world.Net.instance( :Top )
     # --- simulation point related assets ---
     @m.simulation_point.reset
     @m.simulation.must_equal nil

data/test/net_test.rb

@@ -89,9 +89,9 @@ describe YPetri::Net do
 
       describe "plus 1 stoichio. transition with rate" do
         before do
-          @t1 = @w.Transition.avid( ɴ: "T1",
-                                    s: { @p1 => 1, @p2 => -1, @p3 => -1 },
-                                    rate: 0.01 )
+          @t1 = @w.Transition.new( ɴ: "T1", avid: true,
+                                   s: { @p1 => 1, @p2 => -1, @p3 => -1 },
+                                   rate: 0.01 )
           @net.include_transition @t1
         end
 

data/test/place_test.rb

@@ -67,7 +67,7 @@ describe YPetri::Place do
     g = p.common_guard_closure
     -> { g.( 11.1 ) }.must_raise YPetri::GuardError
     begin; p.marking = -1.11; rescue YPetri::GuardError => err
-      err.message.must_equal 'Marking -1.11:Float of P1 should not be negative!'
+      err.message.must_equal 'Marking Float:-1.11 of P1 should not be negative!'
     end
   end
 end

data/test/world_test.rb

@@ -12,16 +12,18 @@ include Pyper if require 'pyper'
 describe YPetri::World do
   before do
     @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.avid ɴ: "AA_appearing",
-                            codomain: a,
-                            rate: -> { 0.1 },
-                            stoichiometry: 1
+    a = @w.Place.new( default_marking: 1.0, name: "AA", avid: true )
+    b = @w.Place.new( default_marking: 2.0, name: "BB", avid: true )
+    c = @w.Place.new( ɴ: "CC", avid: true, default_marking: 3.0 )
+    t1 = @w.Transition.new s: { a => -1, b => -1, c => 1 },
+                           rate: 0.1,
+                           ɴ: "AA_BB_assembly",
+                           avid: true
+    t2 = @w.Transition.new ɴ: "AA_appearing",
+                           avid: true,
+                           codomain: a,
+                           rate: -> { 0.1 },
+                           stoichiometry: 1
     @pp, @tt = [a, b, c], [t1, t2]
     @f_name = "test_output.csv"
     @w.set_imc @pp >> @pp.map( &:default_marking )
@@ -32,7 +34,7 @@ describe YPetri::World do
   end
 
   it "should present places, transitions, nets, simulations" do
-    assert_kind_of YPetri::Net, @w.Net::Top
+    assert_kind_of YPetri::Net, @w.Net.instance( :Top )
     assert_equal @pp[0], @w.place( "AA" )
     assert_equal @tt[0], @w.transition( "AA_BB_assembly" )
     assert_equal @pp, @w.places

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler