y_petri 2.1.44 → 2.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7e84620c9fabe978f5052540808f8533dc6263
-  data.tar.gz: 8bbd7f73ee8d5bd53f3e4c4ff160f11615752109
+  metadata.gz: fa9d7c1831b2aa0a9131a8ca20291215753ba748
+  data.tar.gz: 76818d0b32a6023975fca7f430944dc8c60896e8
 SHA512:
-  metadata.gz: 9ed28df4ab7414b9a9aa165eff7861789a881caebfadba84c2e73d41a989f609a04117dddb2df78180861986a2b4bc957945ba446cfa1a0a369f5a4d15f49307
-  data.tar.gz: e591a344d139ae9ff39ee4459879341038154cd1509ea5f62a315755fb0764a9f7f2e2a505e891613fa88d177da5b15c54f6747e7560eb1fd65abe9983521832
+  metadata.gz: 4890b6da29a0367938da297fdfa60a50ad07d287784c26ed25a179a70d1c18f96abb9ccc2baabae54a4e88580838f465c9201e6712c4a1a46f9d94399a31b6ef
+  data.tar.gz: 7aca2c9a08198e1e2c82fb32d766f523fdbcbab1c3b0117cfdc31f6a85633ee634d069f17ec1f668b4dbefb508910e30b4247ae77a333ebfd32b6aab926d4cf1

data/lib/y_petri/simulation.rb

@@ -74,6 +74,7 @@ class YPetri::Simulation
   delegate :simulation_method,
            :guarded?,
            :step!,
+           :firing_vector_tS,
            to: :core
 
   delegate :recording,
@@ -85,6 +86,33 @@ class YPetri::Simulation
            :print,
            to: :recording
 
+  # Returns the firing of the indicated tS transitions (all tS transitions,
+  # if no argument is given).
+  # 
+  def firing ids_of_tS_transitions=nil
+    tt = tS_transitions()
+    return firing tt if ids_of_tS_transitions.nil?
+    tS_transitions( ids_of_tS_transitions ).map { |t|
+      firing_vector_tS.column_to_a.fetch tt.index( t )
+    }
+  end
+
+  # Firing of the indicated tS transitions (as hash with transition names as
+  # keys).
+  # 
+  def t_firing ids=nil
+    tS_transitions( ids ).names( true ) >> firing( ids )
+  end
+
+  # Pretty prints firing of the indicated tS transitions as hash with transition
+  # names as keys. Takes optional list of tS transition ids (first ordered arg.),
+  # and optional 2 named arguments (+:gap+ and +:precision+), as in
+  # +#pretty_print_numeric_values+.
+  # 
+  def pfiring
+    t_firing( ids ).pretty_print_numeric_values( gap: gap, precision: precision )
+  end
+
   # The basic simulation parameter is :net – +YPetri::Net+ instance which to
   # simulate. Net implies the collection of places and transitions. Other
   # required attributes are +:marking_clamps+ and +:initial_marking+

data/lib/y_petri/simulation/marking_vector/access.rb

@@ -26,19 +26,19 @@ class YPetri::Simulation::MarkingVector
       m_vector( ids ).to_hash
     end
   
-    # Marking of all places (as hash with place names as keys).
+    # Marking of the indicated places (as hash with place names as keys).
     # 
     def p_m ids=nil
       places( ids ).names( true ) >> m( ids )
     end
     alias pn_m p_m
 
-    # Pretty prints marking of all places as hash with place names as keys.
-    # Takes optional list of place ids (ordered argument no. 1), and optional
-    # 2 named arguments (+:gap+ and +:precision+) as in
+    # Pretty prints marking of the indicated places as hash with place names as
+    # keys. Takes optional list of place ids (ordered argument no. 1), and
+    # optional 2 named arguments (+:gap+ and +:precision+), as in
     # +#pretty_print_numeric_values+.
     # 
-    def pm ids=nil, gap: 0, precision: 2
+    def pm ids=nil, gap: 0, precision: 3
       p_m( ids ).pretty_print_numeric_values gap: gap, precision: precision
     end
 

data/lib/y_petri/simulation/timed.rb

@@ -32,7 +32,8 @@ module YPetri::Simulation::Timed
 
   delegate :sampling, to: :recorder
 
-  # Reads the time range.
+  # Returns the flux of the indicated TS transitions (all TS transitions,
+  # if no argument is given).
   #
   def flux ids_of_TS_transitions=nil
     tt = TS_transitions()
@@ -42,6 +43,21 @@ module YPetri::Simulation::Timed
     }
   end
 
+  # Flux of the indicated TS transitions (as hash with transition names as keys).
+  # 
+  def t_flux ids=nil
+    TS_transitions( ids ).names( true ) >> flux( ids )
+  end
+
+  # Pretty prints flux of the indicated TS transitions as hash with transition
+  # names as keys. Takes optional list of transition ids (first ordered arg.),
+  # and optional 2 named arguments (+:gap+ and +:precision), as in
+  # +#pretty_print_numeric_values+.
+  # 
+  def pflux ids=nil, gap: 0, precision: 3
+    t_flux( ids ).pretty_print_numeric_values( gap: gap, precision: precision )
+  end
+
   # Reads the time range (initial_time .. target_time) of the simulation.
   #
   def time_range

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.44"
+  VERSION = "2.1.45"
   DEBUG = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.1.44
+  version: 2.1.45
 platform: ruby
 authors:
 - boris