y_petri 2.1.42 → 2.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9369cc58d87b6dc7099f4852e0c1d65b6a115389
-  data.tar.gz: 7fb31e526e167b754b573a16e8d5cd0157beafa0
+  metadata.gz: 0e7e84620c9fabe978f5052540808f8533dc6263
+  data.tar.gz: 8bbd7f73ee8d5bd53f3e4c4ff160f11615752109
 SHA512:
-  metadata.gz: 90562c12028bb711b27e2cfce1e3436d0100da72c9aae434ed87c38146e7d85974a5fbda2c3ac953e7b093055aa1fff1c13e9d07878045e05a2b95d785068d91
-  data.tar.gz: 77d2083ca5e0db3c5c5c95ec214f0804608f65857e228e77fc1d32d13396be48c1fee4d84254eb600d43025cbc2d2c6c1788eceae651f1bdbaba637b49773d43
+  metadata.gz: 9ed28df4ab7414b9a9aa165eff7861789a881caebfadba84c2e73d41a989f609a04117dddb2df78180861986a2b4bc957945ba446cfa1a0a369f5a4d15f49307
+  data.tar.gz: e591a344d139ae9ff39ee4459879341038154cd1509ea5f62a315755fb0764a9f7f2e2a505e891613fa88d177da5b15c54f6747e7560eb1fd65abe9983521832

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

@@ -73,7 +73,9 @@ class YPetri::Net::State::Features::Record < Array
   # 
   def reconstruct **settings
     marking_clamps = settings[:marking_clamps] || {}
-    m_hsh = features.marking.map { |feat| feat.place } >> marking
+    clamped_places = net.places( marking_clamps.keys )
+    ff = features.marking - net.State.marking( clamped_places )
+    m_hsh = ff.map { |feat| feat.place } >> marking
     net.simulation marking_clamps: marking_clamps, marking: m_hsh, **settings
   end
 

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

@@ -119,12 +119,17 @@ class YPetri::Net::State::Features < Array
     # 
     def infer_from_elements( net_elements )
       new net_elements.map { |e| net.element( e ) }.map { |e|
-        element, element_type = begin
-                                  [ net.place( e ), :place ]
-                                rescue TypeError, NameError
-                                  [ net.transition( e ), :transition ]
+        element, element_type = case e
+                                when Feature() then [ e, :feature ]
+                                else
+                                  begin
+                                    [ net.place( e ), :place ]
+                                  rescue TypeError, NameError
+                                    [ net.transition( e ), :transition ]
+                                  end
                                 end
         case element_type
+        when :feature then element
         when :place then Marking( element )
         when :transition then
           fail TypeError, "Flux / firing features can only be auto-inferred " +

data/lib/y_petri/simulation/timed.rb

@@ -153,6 +153,7 @@ module YPetri::Simulation::Timed
   #
   def init **settings
     method = settings[:method] # the simulation method
+    features_to_record = settings[:record]
     if settings.has? :time, syn!: :time_range then # time range given
       case settings[:time]
       when Range then
@@ -177,7 +178,19 @@ module YPetri::Simulation::Timed
     @step = settings[:step] || time_unit
     @default_sampling = settings[:sampling] || step
     @core = Core().new( method: method, guarded: guarded )
-    @recorder = Recorder().new sampling: settings[:sampling]
+    @recorder = if features_to_record then
+                  # we'll have to figure out features
+                  ff = case features_to_record
+                       when Array then
+                         net.State.Features
+                           .infer_from_elements( features_to_record )
+                       when Hash then
+                         net.State.features( features_to_record )
+                       end
+                  Recorder().new( sampling: settings[:sampling], features: ff )
+                else
+                  Recorder().new( sampling: settings[:sampling] )
+                end
   end
 
   # Sets up subclasses of +Core+ (the simulator) and +Recorder+ (the sampler)

data/lib/y_petri/simulation/timeless.rb

@@ -20,9 +20,22 @@ class YPetri::Simulation
     # 
     def init **settings
       method = settings[:method] # the simulation method
+      features_to_record = settings[:record]
       init_core_and_recorder_subclasses
       @core = Core().new( method: method, guarded: guarded )
-      @recorder = Recorder().new # init the recorder
+      @recorder = if features_to_record then 
+                    # we'll have to figure out features
+                    ff = case features_to_record
+                         when Array then
+                           net.State.Features
+                             .infer_from_elements( features_to_record )
+                         when Hash then
+                           net.State.features( features_to_record )
+                         end
+                    Recorder().new( features: ff )
+                  else
+                    Recorder().new # init the recorder
+                  end
     end
 
     # Sets up subclasses of +Core+ (the simulator) and +Recorder+ (the sampler)

data/lib/y_petri/simulation.rb

@@ -79,6 +79,12 @@ class YPetri::Simulation
   delegate :recording,
            to: :recorder
 
+  alias r recording
+
+  delegate :plot,
+           :print,
+           to: :recording
+
   # 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+
@@ -124,17 +130,12 @@ class YPetri::Simulation
     # Clamped places' mapping to the clamp values.
     @marking_clamps = MarkingClamps().load( m_clamps )
     # Free places' mapping to the initial marking values.
-
-    # 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
-
+    @initial_marking = InitialMarking()
+      .load( if m then # use :marking as :initial_marking when possible
+               init_m_from_init_m = PlaceMapping().load( init_m )
+               init_m_from_marking = PlaceMapping().load( m )
+               init_m_from_marking.merge init_m_from_init_m
+             else init_m end )
     # Set up the place and transition collections.
     @places.complete_initial_marking( use_default_marking: use_default_marking )
     # Correspondence matrix free --> all

data/lib/y_petri/version.rb

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

metadata

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