y_petri 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cac00b355a03f2d444b9a4937721d9ad895666d
-  data.tar.gz: 473f087960a3a4ed4b93cb2bef5262f0a4e8268e
+  metadata.gz: 6265e2cf605fc8fcadcbb29f89be1f12284d88dc
+  data.tar.gz: 96d5da54420128ee32cad846d1715dfe497a3841
 SHA512:
-  metadata.gz: 3c453dbdc36a679375cd5b0439a19ba12c0346847632997fd82c2bffca63827b41d4703454bdef91df863749ba1b933fa7b2987db7f9ec3c4ba8ae71559c5da8
-  data.tar.gz: d2e5603eb81a1633813beef6938fcccacf4eba4d7b1b8ce55ccda511763e1a414b1b5be671de54a3480add0d2f6a260d612aedafbb6a0943ca8330db1eb8fc80
+  metadata.gz: 224b656a992fa458689eebc065da7157f07ec65ea6837fe76b4a317e6fd6fbb80380114394f10a7fd9fe71048c575bc71d37f224dc6cfa31115d4337f96d9c93
+  data.tar.gz: 382dfd8a98e9d444902f5055a10953b6a2903e3055695fe65a5aa8451361eb6eb0fcb6e39e8c6be493a4f921c64ea27f3be13fb4e5c5726d1adb36a860f87b2a

data/lib/y_petri/agent/petri_net_related.rb

@@ -23,7 +23,7 @@ module YPetri::Agent::PetriNetRelated
 
   # Elements and selections:
   # 
-  delegate :place, :transition, :element, 
+  delegate :place, :transition, :element,
            :nets, :places, :transitions,
            to: :world
 
@@ -112,7 +112,7 @@ module YPetri::Agent::PetriNetRelated
 
   # Net constructor: Creates a new Net instance in the current world.
   # 
-  def Net *ordered, **named, &block
+  def Net *args, &block
     world.Net.send( :new, *ordered, **named, &block )
   end
 

data/lib/y_petri/agent/simulation_related.rb

@@ -101,10 +101,19 @@ module YPetri::Agent::SimulationRelated
            :set_clamp_collection, :ncc,
            :set_initial_marking_collection, :nimc,
            :set_simulation_settings_collection, :set_ssc,
-           :new_simulation,
-           :clamp_cc, :initial_marking_cc, :simulation_settings_cc,
+           :new_simulation, :clamp_cc,
+           :initial_marking_cc, :simulation_settings_cc,
            to: :world
 
+  delegate :pm, to: :simulation
+
+  # Pretty print the state.
+  # 
+  def state
+    pp pm
+    return nil
+  end
+
   # Returns the simulation identified by the argument, or one at simulation
   # point, if no argument given. The simulation is identified in the same way
   # as for #simulation_point_to method.
@@ -341,7 +350,7 @@ module YPetri::Agent::SimulationRelated
     tt = transitions.nil? ? simulation.tt : tranisitions
     tt = simulation.tt( tt )
     tt -= simulation.ee( except )
-    rec.delta( pp, transitions: tt, delta_time: options[:delta_time] )
+    rec.delta( pp, transitions: tt, Δt: options[:delta_time] )
       .plot( title: title, ylabel: ylabel, **options )
   end
 end # module YPetri::Agent::SimulationRelated

data/lib/y_petri/net/data_set.rb

@@ -212,26 +212,25 @@ class YPetri::Net::DataSet < Hash
   def plot( time: nil, **nn )
     events = events()
     data_ss = series
-    x_range = if time.is_a? Range then
+    x_range = if time.nil? then
+                "[#{events.first}:#{events.last}]"
+              elsif time.is_a? Range then
                 "[#{time.begin}:#{time.end}]"
               else
                 "[-0:#{SY::Time.magnitude( time ).amount rescue time}]"
               end
-    
     Gnuplot.open do |gp|
       Gnuplot::Plot.new gp do |plot|
         plot.xrange x_range
         plot.title nn[:title] || "#{net} plot"
         plot.ylabel nn[:ylabel] || "Values"
         plot.xlabel nn[:xlabel] || "Time [s]"
-        
-        features.labels.zip( data_ss )
-          .each { |label, data_array|
+        features.labels.zip( data_ss ).each do |label, data_array|
           plot.data << Gnuplot::DataSet.new( [ events, data_array ] ) { |ds|
             ds.with = "linespoints"
             ds.title = label
           }
-        }
+        end
       end
     end
   end

data/lib/y_petri/net/state/features/record.rb

@@ -27,6 +27,13 @@ class YPetri::Net::State::Features::Record < Array
     features.map { |f| fetch( f ).round( precision ) }
   end
 
+  # Pretty prints the record with feature names.
+  # 
+  def print gap: 4, precision: 4
+    hsh = features.labels >> dump( precision: precision )
+    hsh.pretty_print_numeric_values gap: gap, precision: precision
+  end
+
   # Returns an identified feature, or fails.
   # 
   def fetch feature

data/lib/y_petri/place.rb

@@ -14,7 +14,6 @@ class YPetri::Place
 
   class << self
     ★ YPetri::World::Dependency
-
     private :new
   end
 
@@ -79,7 +78,9 @@ class YPetri::Place
 
   # Getter of +@marking+ attribute.
   # 
-  def m; @marking end
+  def m
+    @marking
+  end
   alias value m
 
   # This method, which acts as a simple getter of +@marking+ attribute if no
@@ -108,11 +109,15 @@ class YPetri::Place
 
   # Alias for #marking=
   # 
-  def value=( marking ); self.marking = marking end
+  def value=( marking )
+    self.marking = marking
+  end
 
   # Alias for #marking=
   # 
-  def m=( marking ); self.marking = marking end
+  def m=( marking )
+    self.marking = marking
+  end
 
   # Adds tokens to the place.
   # 

data/lib/y_petri/simulation/elements.rb

@@ -5,7 +5,7 @@
 class YPetri::Simulation
   class Elements < Array
     ★ Dependency
-    
+
     class << self
       # New collection constructor
       #
@@ -15,13 +15,13 @@ class YPetri::Simulation
     end
 
     delegate :simulation, to: "self.class"
-    
+
     # Loads elements to this collection.
     #
     def load elements
       elements.each{ |e| push e }
     end
-    
+
     # Creates a subset of this collection (of the same class).
     #
     def subset element_ids=nil, &block

data/lib/y_petri/simulation/transition_representation/A.rb

@@ -4,7 +4,7 @@
 # 
 module YPetri::Simulation::TransitionRepresentation::Type_A
   attr_reader :assignment_closure
-  
+
   # Assignment action -- true for A transitions.
   # 
   def A?
@@ -19,26 +19,58 @@ module YPetri::Simulation::TransitionRepresentation::Type_A
     false
   end
 
+  # Nil for assignment transitions. Though technically timeless, assignment
+  # transitions are considered outside the t/T types.
+  # 
+  def T?
+    nil
+  end
+  alias timed? T?
+
+  # Nil for assignment transitions. Though technically timeless, assignment
+  # transitions are considered outside the t/T types.
+  # 
+  def t?
+    nil
+  end
+  alias timeless? t?
+
+  # Nil for assignment transitions. Though technically timeless, assignment
+  # transitions are considered outside the s/S types.
+  # 
+  def S?
+    nil
+  end
+  alias timed? T?
+
+  # Nil for assignment transitions. Though technically timeless, assignment
+  # transitions are considered outside the s/S types.
+  # 
+  def s?
+    nil
+  end
+  alias timeless? t?
+
   # Initialization subroutine.
   # 
   def init
     @assignment_closure = to_assignment_closure
   end
-  
+
   # Returns the assignments, as they would happen if this A transition fired,
   # as hash places >> action.
   # 
   def action
     act.select { |pl, v| pl.free? }
   end
-  
+
   # Returns the assignments to all places, as they would happen if A transition
   # could change their values.
   # 
   def act
     codomain >> Array( function.( *domain_marking ) )
   end
-  
+
   # Builds an assignment closure, which, when called, directly affects the
   # simulation's marking vector (free places only).
   # 

data/lib/y_petri/simulation/transition_representation/t.rb

@@ -5,28 +5,28 @@
 class YPetri::Simulation::TransitionRepresentation
   module Type_t
     include Type_a
-    
+
     # False for timed transitions.
     # 
     def T?
       false
     end
     alias timed? T?
-    
+
     # True for timed transitions.
     # 
     def t?
       true
     end
     alias timeless? t?
-    
+
     # Initialization subroutine.
     # 
     def init
       super
       @function = source.action_closure
     end
-    
+
     # Change, as it would happen if the transition fired, returned as hash
     # codomain places >> change.
     # 

data/lib/y_petri/simulation/transition_representation/types.rb

@@ -27,32 +27,32 @@ class YPetri::Simulation::TransitionRepresentation
              else fail TypeError, "Unknown tr. type #{source.type}!" end
       init
     end
-    
+
     # The transition's type.
     # 
     def type
       return :A if A?
       if T? then S? ? :TS : :Ts else S? ? :tS : :ts end
     end
-    
+
     # Is this a TS transition?
     # 
     def TS?
       type == :TS
     end
-    
+
     # Is this a Ts transition?
     # 
     def Ts?
       type == :Ts
     end
-    
+
     # Is this a tS transition?
     # 
     def tS?
       type == :tS
     end
-    
+
     # Is this a ts transition?
     # 
     def ts?

data/lib/y_petri/simulation/transitions/types.rb

@@ -22,7 +22,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_s }
         end ).load subset( &:s? )
     end
-    
+
     # Subset of S type transitions, if any.
     # 
     def S
@@ -30,7 +30,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_S }
         end ).load subset( &:S? )
     end
-    
+
     # Subset of t type transitions, if any.
     # 
     def t
@@ -38,7 +38,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_t }
         end ).load subset( &:t? )
     end
-    
+
     # Subset of T type transitions, if any.
     # 
     def T
@@ -46,7 +46,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_T }
         end ).load subset( &:T? )
     end
-    
+
     # Subset of ts type transitions, if any.
     # 
     def ts
@@ -54,7 +54,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_ts }
         end ).load subset( &:ts? )
     end
-    
+
     # Subset of tS type transitions, if any.
     # 
     def tS
@@ -62,7 +62,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_tS }
         end ).load subset( &:tS? )
     end
-    
+
     # Subset of Ts type transitions, if any.
     # 
     def Ts
@@ -70,7 +70,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_Ts }
         end ).load subset( &:Ts? )
     end
-    
+
     # Subset of TS type transitions, if any.
     # 
     def TS
@@ -78,7 +78,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_TS }
         end ).load subset( &:TS? )
     end
-    
+
     # Subset of A type transitions, if any.
     # 
     def A
@@ -86,7 +86,7 @@ class YPetri::Simulation::Transitions
           klass.class_exec { include Type_A }
         end ).load subset( &:A? )
     end
-    
+
     # Subset of a type transitions, if any.
     # 
     def a

data/lib/y_petri/simulation/transitions.rb

@@ -1,4 +1,4 @@
-#encoding: utf-8
+# encoding: utf-8
 
 # Transition collection for YPetri::Simulation.
 #

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.10"
+  VERSION = "2.1.11"
   DEBUG = false
 end

data/lib/y_petri.rb

@@ -8,6 +8,7 @@ require 'active_support/inflector'
 require 'gnuplot'                      # used for graph visualization
 require 'csv'                          # not used at the moment
 require 'graphviz'                     # used for Petri net visualization
+require 'pp'                           # usef for pretty
 
 # The following are the YSupport components used by YPetri:
 require 'y_support/local_object'       # object aware of its creation scope

metadata

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