y_petri 2.1.40 → 2.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6659d702646cc5152a102789cf4cb6ddc5f8daba
-  data.tar.gz: 87b61e7babacfe37ce61c18060cda4dab75751ee
+  metadata.gz: 9369cc58d87b6dc7099f4852e0c1d65b6a115389
+  data.tar.gz: 7fb31e526e167b754b573a16e8d5cd0157beafa0
 SHA512:
-  metadata.gz: 9763731c1823a33bfa7855b7841da3161fb53ec63c13bed00cb75620ace66b9bdd9c9ca25e2af906ed2afb5dbadb5256c6735a0389c311d9834551c404edc4d6
-  data.tar.gz: a9d02f80ec783ac589e7d57ef089dc138c83ac15738a77d016f636bf47762fd8f97d78b0d29ef2c881a216d81c521c186ecde76d67a85809910666d032ba878d
+  metadata.gz: 90562c12028bb711b27e2cfce1e3436d0100da72c9aae434ed87c38146e7d85974a5fbda2c3ac953e7b093055aa1fff1c13e9d07878045e05a2b95d785068d91
+  data.tar.gz: 77d2083ca5e0db3c5c5c95ec214f0804608f65857e228e77fc1d32d13396be48c1fee4d84254eb600d43025cbc2d2c6c1788eceae651f1bdbaba637b49773d43

data/lib/y_petri/net/data_set.rb

@@ -33,7 +33,8 @@ class YPetri::Net::DataSet < Hash
            :Marking, :Firing, :Flux, :Gradient, :Delta,
            to: "self.class"
 
-  attr_reader :type # more like event_type, idea not matured yet
+  attr_reader :type, # more like event_type, idea not matured yet
+              :settings
 
   # Type of the dataset.
   # 
@@ -75,9 +76,10 @@ class YPetri::Net::DataSet < Hash
 
   # Recreates the simulation at a given event label.
   # 
-  def reconstruct event: (fail "No event given!"),
-    **settings # settings include marking clamps
+  def reconstruct event: (fail "No event given!"), **settings
+    # settings may include marking clamps, marking, inital marking...
     rec = interpolate( event )
+    settings = settings().merge settings if settings()
     if timed? then
       rec.reconstruct time: event, **settings
     else
@@ -136,6 +138,7 @@ class YPetri::Net::DataSet < Hash
   # Returns the data series for the specified features.
   # 
   def series arg=nil
+    
     return records.transpose if arg.nil?
     reduce_features( State().features( arg ) ).series
   end
@@ -174,12 +177,10 @@ class YPetri::Net::DataSet < Hash
               end
             end
           else
-            line = reduced_features.map do |feature|
-              if absent_features.include? feature then
-                feature.extract_from( sim )
-              else
-                record.fetch feature
-              end
+            line = reduced_features.map do |feat|
+              if absent_features.include? feat then
+                feat.extract_from( sim )
+              else record.fetch( feat ) end
             end
           end
         end
@@ -272,7 +273,8 @@ class YPetri::Net::DataSet < Hash
     time = nn.may_have :time, syn!: :time_range
     events = events()
     if element_ids.nil? then
-      ff = if nn.empty? then features else net.State.features( nn ) end
+      nn_ff = nn.slice [ :marking, :flux, :firing, :gradient, :delta ]
+      ff = nn_ff.empty? ? features : net.State.features( nn_ff )
     else
       ff = net.State.Features.infer_from_elements( element_ids )
     end
@@ -297,6 +299,11 @@ class YPetri::Net::DataSet < Hash
     Gnuplot.open do |gp|
       Gnuplot::Plot.new gp do |plot|
         plot.xrange x_range
+        if nn.has? :yrange, syn!: :y_range then
+          if nn[:yrange].is_a? Range then
+            plot.yrange "[#{nn[:yrange].begin}:#{nn[:yrange].end}]"
+          else fail TypeError, "Argument :yrange is not a range!" end
+        end
         plot.title nn[:title] || "#{net} plot"
         plot.ylabel nn[:ylabel] || "Values"
         plot.xlabel nn[:xlabel] || "Time [s]"

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

@@ -71,9 +71,10 @@ class YPetri::Net::State::Features::Record < Array
   # has need for any special settings, these must be supplied to this method.
   # (Timed nets eg. require +:time+ named argument for successful construction.)
   # 
-  def reconstruct marking_clamps: {}, **settings
+  def reconstruct **settings
+    marking_clamps = settings[:marking_clamps] || {}
     m_hsh = features.marking.map { |feat| feat.place } >> marking
-    net.simulation marking_clamps: {}, marking: m_hsh, **settings
+    net.simulation marking_clamps: marking_clamps, marking: m_hsh, **settings
   end
 
   # Expects a marking feature identifier (place identifier or Marking instance),

data/lib/y_petri/simulation/recorder.rb

@@ -11,7 +11,14 @@ class YPetri::Simulation::Recorder
 
   SAMPLING_DECIMAL_PLACES = 5
 
-  attr_reader :features, :recording
+  attr_reader :features
+
+  def recording
+    @recording.tap { |ds|
+      ds.instance_variable_set :@settings, simulation.settings( true )
+    }
+  end
+
   delegate :simulation, to: "self.class"
   delegate :reconstruct, :reduce, to: :recording
 
@@ -26,7 +33,7 @@ class YPetri::Simulation::Recorder
     if recording then reset! recording: recording else reset! end
   end
 
-  # Construct a new recording based on +features+.
+  # Construct a new recording based on the parametrized class Recording().
   # 
   def new_recording
     features.new_dataset

data/lib/y_petri/simulation/timed.rb

@@ -152,6 +152,7 @@ module YPetri::Simulation::Timed
   # +@recorder+ attribute.
   #
   def init **settings
+    method = settings[:method] # the simulation method
     if settings.has? :time, syn!: :time_range then # time range given
       case settings[:time]
       when Range then
@@ -175,6 +176,7 @@ module YPetri::Simulation::Timed
     reset_time!
     @step = settings[:step] || time_unit
     @default_sampling = settings[:sampling] || step
+    @core = Core().new( method: method, guarded: guarded )
     @recorder = Recorder().new sampling: settings[:sampling]
   end
 

data/lib/y_petri/simulation/timeless.rb

@@ -19,7 +19,9 @@ class YPetri::Simulation
     # and initializes the +@recorder+ attribute.
     # 
     def init **settings
+      method = settings[:method] # the simulation method
       init_core_and_recorder_subclasses
+      @core = Core().new( method: method, guarded: guarded )
       @recorder = Recorder().new # init the recorder
     end
 

data/lib/y_petri/simulation.rb

@@ -99,11 +99,10 @@ class YPetri::Simulation
   # arguments has to be set for timed simulations.
   # 
   def initialize **settings
-    method = settings[:method] # the simulation method
     @guarded = settings[:guarded] # guarding on / off
     m_clamps = settings[:marking_clamps] || {}
     m = settings[:marking]
-    init_m = settings[:initial_marking] || m || {}
+    init_m = settings[:initial_marking] || {}
     use_default_marking = if settings.has? :use_default_marking then
                             settings[ :use_default_marking ]
                           else true end
@@ -125,7 +124,17 @@ class YPetri::Simulation
     # Clamped places' mapping to the clamp values.
     @marking_clamps = MarkingClamps().load( m_clamps )
     # Free places' mapping to the initial marking values.
-    @initial_marking = InitialMarking().load( init_m )
+
+    # Use :marking as :initial_marking when possible.
+    if m then
+      init_m_from_init_m = PlaceMapping().load( init_m )
+      init_m_from_marking = PlaceMapping().load( m )
+      rslt = init_m_from_marking.merge init_m_from_init_m
+      @initial_marking = InitialMarking().load( rslt )
+    else
+      @initial_marking = InitialMarking().load( init_m )
+    end
+
     # Set up the place and transition collections.
     @places.complete_initial_marking( use_default_marking: use_default_marking )
     # Correspondence matrix free --> all
@@ -157,8 +166,6 @@ class YPetri::Simulation
       @Ts_gradient_closure = transitions.Ts.gradient_closure
       @TS_rate_closure = transitions.TS.rate_closure
     end
-    # Init the core.
-    @core = Core().new( method: method, guarded: guarded  )
     # Reset.
     if m then reset! marking: m else reset! end
   end

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.40"
+  VERSION = "2.1.42"
   DEBUG = false
 end

metadata

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