y_petri 2.1.36 → 2.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509f2defaf79d34c62eb0d964c3626fb49d87d2c
-  data.tar.gz: 192651ad32c9854c72182c637744e4e58e05233d
+  metadata.gz: e8bd3d0de26cf79301633503c11a780226ec1e1b
+  data.tar.gz: a8da1ce1d92d383d917116dde22356b97a42aabf
 SHA512:
-  metadata.gz: 3663b4d86cc496f7ad09209f24dc64754cace4ddf456681bb5dbb4905f4cdaf6b319bd80ecd4d1da738c881e47a9da75e068592135d6af3bba2e159a6c5e2369
-  data.tar.gz: 02dc44901cdd06c634d2801d9b648186d67b17d3d52efdab31bfd097043af334b7dc4dabd72101958c77de9ae1765c42e562281c091441b9147df23119343672
+  metadata.gz: 76b36988750b6ba018af3efe5f33a2017838d702a49331b8e529b05149cfbff662d78e2eeaa02dfb9f3971956be04a597483c4efb4173aa49799d946a3419eb1
+  data.tar.gz: 26d6113132e1154ba1a534429316a61382f62e88d7574a6f28339d8b220e9388bd278286011f92e10f5baef4670fb0e59db1bd1d749ce794670e71a874062bf7

data/lib/y_petri/net/data_set.rb

@@ -114,7 +114,7 @@ class YPetri::Net::DataSet < Hash
     sampling = nn.must_have :sampling
     t0, target_time = time_range.begin, time_range.end
     t = t0
-    o = self.class.new
+    o = self.class.new type: type
     loop do
       o.update t => interpolate( t )
       t += sampling

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

@@ -71,7 +71,8 @@ class YPetri::Net::State::Features::Record < Array
   # (Timed nets eg. require +:time+ named argument for successful construction.)
   # 
   def reconstruct marking_clamps: {}, **settings
-    net.simulation marking_clamps: {}, marking: marking, **settings
+    m_hsh = features.marking.map { |feat| feat.place } >> marking
+    net.simulation marking_clamps: {}, marking: m_hsh, **settings
   end
 
   # Expects a marking feature identifier (place identifier or Marking instance),
@@ -80,11 +81,11 @@ class YPetri::Net::State::Features::Record < Array
   # corresponding values. If no argument is given, values from this record for
   # all the present marking features are returned.
   # 
-  def marking id=nil
-    return marking( features.marking ) if id.nil?
-    case id
-    when Array then id.map { |id| marking id }
-    else fetch( features.marking id ) end
+  def marking arg=nil
+    return marking( features.marking ) if arg.nil?
+    case arg
+    when Array then arg.map { |id| marking id }
+    else fetch( features.marking arg ) end
   end
 
   # Expects a flux feature identifier (transition identifier or Flux instance),

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

@@ -15,7 +15,7 @@ class YPetri::Net::State::Features < Array
           ç.define_singleton_method symbol do value end
         }
         ç.param_class( { Record: Record,
-                         Dataset: YPetri::Net::DataSet },
+                         DataSet: YPetri::Net::DataSet },
                        with: { Features: ç } )
       end
     end
@@ -42,7 +42,7 @@ class YPetri::Net::State::Features < Array
         # Parametrize them <em>one more time</em> with Features instance.
         # Banged version of #param_class! ensures that #Record, #Dataset
         # methods are shadowed.
-        inst.param_class!( { Record: Record(), Dataset: Dataset() },
+        inst.param_class!( { Record: Record(), DataSet: DataSet() },
                            with: { features: inst } )
       end
     end
@@ -137,7 +137,7 @@ class YPetri::Net::State::Features < Array
   # Constructs a new dataset from these features.
   # 
   def new_dataset *args, &blk
-    Dataset().new *args, &blk
+    DataSet().new *args, &blk
   end
 
   # Feature summation -- of feature class.
@@ -183,14 +183,14 @@ class YPetri::Net::State::Features < Array
   # corresponding features from this feature set. If no argument is given, all
   # the marking features from this set are returned.
   #
-  def marking id=nil
-    return marking( select { |f| f.is_a? Marking() } ) if id.nil?
-    case id
-    when Array then self.class.new( id.map { |id| marking id } )
+  def marking arg=nil
+    return marking( select { |feat| feat.is_a? Marking() } ) if arg.nil?
+    case arg
+    when Array then self.class.new( arg.map { |id| marking id } )
     else
-      Marking( id ).tap do |feature|
+      Marking( arg ).tap do |feature|
         include? feature or
-          fail KeyError, "No marking feature '#{id}' in this feature set!"
+          fail KeyError, "No marking feature '#{arg}' in this feature set!"
       end
     end
   end
@@ -201,14 +201,14 @@ class YPetri::Net::State::Features < Array
   # array of corresponding features from this feature set. If no argument is
   # given, all the firing features from this set are returned.
   #
-  def firing id=nil
-    return firing( select { |f| f.is_a? Firing() } ) if id.nil?
-    case id
-    when Array then self.class.new( id.map { |id| firing id } )
+  def firing arg=nil
+    return firing( select { |feat| feat.is_a? Firing() } ) if arg.nil?
+    case arg
+    when Array then self.class.new( arg.map { |id| firing id } )
     else
-      Firing( id ).tap do |feature|
+      Firing( arg ).tap do |feature|
         include? feature or
-          fail KeyError, "No firing feature '#{id}' in this feature set!"
+          fail KeyError, "No firing feature '#{arg}' in this feature set!"
       end
     end
   end
@@ -219,14 +219,14 @@ class YPetri::Net::State::Features < Array
   # of corresponding features from this feature set. If no argument is given,
   # all the flux features from this set are returned.
   #
-  def flux id=nil
-    return flux( select { |f| f.is_a? Flux() } ) if id.nil?
-    case id
-    when Array then self.class.new( id.map { |id| flux id } )
+  def flux arg=nil
+    return flux( select { |feat| feat.is_a? Flux() } ) if arg.nil?
+    case arg
+    when Array then self.class.new( arg.map { |id| flux id } )
     else
-      Flux( id ).tap do |feature|
+      Flux( arg ).tap do |feature|
         include? feature or
-          fail KeyError, "No flux feature '#{id}' in this feature set!"
+          fail KeyError, "No flux feature '#{arg}' in this feature set!"
       end
     end
   end
@@ -239,18 +239,19 @@ class YPetri::Net::State::Features < Array
   # corresponding features from this feature set. If no argument is given,
   # all the gradient features from this feature set are returned.
   # 
-  def gradient id=nil, transitions: nil
-     if id.nil? then
-       return gradient( select { |f| f.is_a? Gradient() } ) if transitions.nil?
-       gradient.select { |f| f.transitions == net.tt( transitions ) }
+  def gradient arg=nil, transitions: nil
+     if arg.nil? then
+       return gradient( select { |feat| feat.is_a? Gradient() } ) if
+         transitions.nil?
+       gradient.select { |feat| feat.transitions == net.tt( transitions ) }
      else
-       case id
+       case arg
        when Array then
-         self.class.new( id.map { |id| gradient id, transitions: transitions } )
+         self.class.new( arg.map { |id| gradient id, transitions: transitions } )
        else
-         Gradient( id, transitions: transitions ).tap do |feature|
+         Gradient( arg, transitions: transitions ).tap do |feature|
            include? feature or
-             fail KeyError, "No gradient feature '#{id}' in this fature set!"
+             fail KeyError, "No gradient feature '#{arg}' in this fature set!"
          end
        end
      end
@@ -263,18 +264,19 @@ class YPetri::Net::State::Features < Array
   # identifiers is supplied, it is mapped to the array of corresponding features
   # from thie feature set.
   #
-  def delta
-    if id.nil? then
-      return delta( select { |f| f.is_a? Delta() } ) if transitions.nil?
-      delta.select { |f| f.transitions == net.tt( transitions ) }
+  def delta arg=nil, transitions: nil
+    if arg.nil? then
+      return delta( select { |feat| feat.is_a? Delta() } ) if
+        transitions.nil?
+      delta.select { |feat| feat.transitions == net.tt( transitions ) }
     else
-      case id
+      case arg
       when Array then
-        self.class.new( id.map { |id| delta id, transitions: transitions } )
+        self.class.new( arg.map { |id| delta id, transitions: transitions } )
       else
-        Delta( id, transitions: transitions ).tap do |feature|
+        Delta( arg, transitions: transitions ).tap do |feature|
           include? feature or
-            fail KeyError, "No delta feature '#{id}' in this feature set!"
+            fail KeyError, "No delta feature '#{arg}' in this feature set!"
         end
       end
     end

data/lib/y_petri/net.rb

@@ -135,7 +135,8 @@ class YPetri::Net
   def to_s
     "#<Net: " +
       ( name.nil? ? "%s" : "name: #{name}, %s" ) %
-      "#{pp.size rescue '∅'} places, #{tt.size rescue '∅'} transitions" + ">"
+      "#{pp.size rescue '∅'} places, #{tt.size rescue '∅'} transitions" +
+      ">"
   end
 
   # Inspect string of the instance.

data/lib/y_petri/simulation/marking_vector.rb

@@ -92,7 +92,13 @@ class YPetri::Simulation
     # given, starting vector is used.
     # 
     def reset! arg=self.class.starting
-      arg.each.to_a.zip( annotation ).map { |value, place| set place, value }
+      case arg
+      when Hash then
+        mapping = simulation.PlaceMapping().load( arg )
+        reset! places.map { |pl| mapping[ pl ] }
+      else # array arg assumed
+        arg.each.to_a.zip( annotation ).map { |value, place| set place, value }
+      end
     end
 
     # Access of the vector elements.

data/lib/y_petri/simulation.rb

@@ -81,21 +81,29 @@ class YPetri::Simulation
 
   # 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. These can be
-  # extracted from the Place and Transition instances if not given explicitly.
+  # required attributes are +:marking_clamps+ and +:initial_marking+
+  # (or +:marking -- if no +:initial_marking+ is supplied, +:marking+ will be
+  # used in its stead). There is a possibility to extract the initial marking
+  # from the net elements directly, controlled by the optional argument
+  # +:use_default_marking+, _true_ by default. It means that even if the caller
+  # does not supply required +:initial_marking+ values, the constructor will
+  # extract them from the places, so long as these have their initial markings
+  # set. Setting +:use_default_marking+ to _false_ will cause an error unless
+  # +:initial_marking+ and +:place_clamps+ are supplied explicitly. 
+  # 
   # Simulation method is controlled by the :method argument, guarding is
-  # switched on and off by the :guarded argument (true/false). If timed
-  # transitions are present, the simulation is considered timed. Timed
-  # simulation constructor has additional arguments :time, establishing time
-  # range, :step, controlling the simulation step size, and :sampling,
-  # controlling the sampling frequency.
+  # switched on and off by the :guarded argument (_true_ / _false_). Simulations
+  # of timed nets are timed. A timed simulation constructor may have +:time+
+  # (alias +:time_range+), +:step+, controlling the size of the simulation step,
+  # and +:sampling+, controlling the sampling period. At least one of these named
+  # 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] || {}
+    init_m = settings[:initial_marking] || m || {}
     use_default_marking = if settings.has? :use_default_marking then
                             settings[ :use_default_marking ]
                           else true end
@@ -193,7 +201,7 @@ class YPetri::Simulation
     "#<Simulation: pp: %s, tt: %s, oid: %s>" % [ pp.size, tt.size, object_id ]
   end
 
-  # Resets the simulation
+  # Resets the simulation.
   # 
   def reset! **nn
     m = nn[:marking]

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.36"
+  VERSION = "2.1.37"
   DEBUG = false
 end

data/test/net_test.rb

@@ -199,3 +199,53 @@ describe YPetri::Net::State do
     -> { @St.feature( marking: :A ) }.must_raise NameError
   end
 end
+
+
+describe YPetri::Net::DataSet do
+  before do
+    @w = YPetri::World.new
+    @net = @w.Net.send :new
+    @net << @w.Place.send( :new, ɴ: :A )
+    @net << @w.Place.send( :new, ɴ: :B )
+    @net << @w.Transition.send( :new, ɴ: :A2B, s: { A: -1, B: 1 }, rate: 0.01 )
+    @net << @w.Transition.send( :new, ɴ: :A_plus, s: { A: 1 }, rate: 0.001 )
+  end
+
+  it "should be constructible" do
+    ds = @net.State.marking( [:A, :B] ).new_dataset( type: :foobar )
+    ds.update foo: [ 42, 43 ]
+    ds.update bar: [ 43, 42 ]
+    ds.timed?.must_equal false
+    ds2 = @net.State.marking.new_dataset( type: :timed )
+    ds2.timed?.must_equal true
+    ds2.features.must_equal @net.State.marking( [:A, :B] )
+  end
+
+  describe "timed dataset" do
+    before do
+      @ds = @net.State.marking.new_dataset( type: :timed )
+      @ds.update 0.0 => [ 0, 0 ]
+      @ds.update 10.0 => [ 1, 0.5 ]
+      @ds.update 50.0 => [ 2, 3 ]
+      @ds.update 200.0 => [ 2.5, 7 ]
+    end
+
+    it "should give a nice plot" do
+      @ds.plot
+    end
+
+    describe "resampling" do
+      before do
+        @resampled_ds = @ds.resample sampling: 11
+      end
+
+      it "should give a nice plot" do
+        @resampled_ds.plot
+      end
+
+      it "should be able to reconstruct the flux" do
+        @resampled_ds.flux.plot
+      end
+    end
+  end
+end

metadata

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