y_petri 2.1.33 → 2.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e532fceaec5c32c5ee7ca4364a2165f134d94f
-  data.tar.gz: 2ca12cc72e7f7372d513eaccea15f024a6eda626
+  metadata.gz: eaa1e130702b9531a81dd9cc1edc9d9e62b8caf8
+  data.tar.gz: b55819cc1a3b556516105ff971b434a97e4cde9a
 SHA512:
-  metadata.gz: ab51a968eeb6c30f87d5f12dba00311a32e5bb6042ba0cc8a4d638cdecf352294a32da4dd5737f96f4a3da8220801d858a8cd4b120792f2837124edd9592b549
-  data.tar.gz: 2f4e63e8c7d3ec1d619b8685886bc66cba4a899b46c4ac69f6ca6929df878110e6015970d3b0cc99e696d2b4f994d5855029cc913ba04b05d6ce05bb992e0665
+  metadata.gz: 64d8b917eae58576d9f3b0c359c6f09ba7be768cbb581996f41dd303cae2b074d5cac17c00d2d39c4cf82aa16d112360e862057ffc79fea8744fd88e4b936864
+  data.tar.gz: 8d3a8be4cc3728908fa2d44f1e1ba7ace44bc6c80808cad9ed4169c0552dd17caa0b5fcdb8e0c411ae1b0dc37afdd62ea5663b43402a8d0d347693dae7072054

data/lib/y_petri/net/data_set.rb

@@ -258,11 +258,15 @@ class YPetri::Net::DataSet < Hash
     map { |lbl, rec| [ lbl, *rec ].join ',' }.join "\n"
   end
 
-  # Plots the dataset.
+  # Plots the dataset. Takes several optional arguments: The list of features
+  # to plot as the first ordered argument, 
   # 
-  def plot( time: nil, **nn )
+  def plot( feature_ids=nil, time: nil, except: [], **nn )
+    time = nn.may_have :time, syn!: :time_range
     events = events()
-    data_ss = series
+    ff = feature_ids.nil? ? features : net.state.features( feature_ids )
+    ff -= net.state.features( except )
+    data_ss = series( ff )
     x_range = if time.nil? then
                 from = events.first || 0
                 to = events.last && events.last > from ? events.last :
@@ -279,7 +283,7 @@ class YPetri::Net::DataSet < Hash
         plot.title nn[:title] || "#{net} plot"
         plot.ylabel nn[:ylabel] || "Values"
         plot.xlabel nn[:xlabel] || "Time [s]"
-        features.labels.zip( data_ss ).each do |label, data_array|
+        ff.labels.zip( data_ss ).each do |label, data_array|
           plot.data << Gnuplot::DataSet.new( [ events, data_array ] ) { |ds|
             ds.with = "linespoints"
             ds.title = label

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

@@ -126,6 +126,12 @@ class YPetri::Net::State::Feature::Delta < YPetri::Net::State::Feature
     ! timed?
   end
 
+  # Type of this feature.
+  # 
+  def type
+    :delta
+  end
+
   # A string briefly describing this delta feature.
   # 
   def to_s

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

@@ -66,6 +66,12 @@ class YPetri::Net::State::Feature::Firing < YPetri::Net::State::Feature
     end
   end
 
+  # Type of this feature.
+  # 
+  def type
+    :flux
+  end
+
   # A string briefly describing the firing feature.
   # 
   def to_s

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

@@ -51,7 +51,7 @@ class YPetri::Net::State::Feature::Flux < YPetri::Net::State::Feature
   # identifier).
   # 
   def initialize id
-    @transition = net.transition( id.is_a?( Flux ) ? id.transition : id )
+    @transition = net.transition id.is_a?( Flux ) ? id.transition : id
   end
 
   # Extracts the receiver marking feature from the argument. This can be
@@ -66,6 +66,12 @@ class YPetri::Net::State::Feature::Flux < YPetri::Net::State::Feature
     end
   end
 
+  # Type of this feature.
+  # 
+  def type
+    :flux
+  end
+
   # A string briefly describing the flux feature.
   # 
   def to_s

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

@@ -78,6 +78,12 @@ class YPetri::Net::State::Feature::Gradient < YPetri::Net::State::Feature
     end
   end
 
+  # Type of this feature.
+  # 
+  def type
+    :gradient
+  end
+
   # A string briefly describing the gradient feature.
   # 
   def to_s

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

@@ -65,6 +65,12 @@ class YPetri::Net::State::Feature::Marking < YPetri::Net::State::Feature
     end
   end
 
+  # Type of this feature.
+  # 
+  def type
+    :marking
+  end
+
   # A string briefly describing the marking feature.
   # 
   def to_s

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.33"
+  VERSION = "2.1.34"
   DEBUG = false
 end

metadata

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