y_petri 2.1.31 → 2.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c98edfb8140dbc62e7012bd0ce4d25978451e22
-  data.tar.gz: 6c3d695901347b8bf8deac87999bc588c21ed503
+  metadata.gz: 43e532fceaec5c32c5ee7ca4364a2165f134d94f
+  data.tar.gz: 2ca12cc72e7f7372d513eaccea15f024a6eda626
 SHA512:
-  metadata.gz: 78e6c1c2aa034e7e893411600381d3e4bad5cd4ec3e5a12f5dbc1a10fb938d7c90c0258a252474391b7f3092994f8b6b28e74bc17c26d61c8a6d7721871e30c6
-  data.tar.gz: bec532ac1b9c25649a75e34d6e7806a774d231e6cdefc990c555559324ebc92a98cc460ac28004bba5f3f357a66a9191fcf1475c76c272ac26caaff20fb43997
+  metadata.gz: ab51a968eeb6c30f87d5f12dba00311a32e5bb6042ba0cc8a4d638cdecf352294a32da4dd5737f96f4a3da8220801d858a8cd4b120792f2837124edd9592b549
+  data.tar.gz: 2f4e63e8c7d3ec1d619b8685886bc66cba4a899b46c4ac69f6ca6929df878110e6015970d3b0cc99e696d2b4f994d5855029cc913ba04b05d6ce05bb992e0665

data/lib/y_petri/agent/simulation_related.rb

@@ -107,7 +107,9 @@ module YPetri::Agent::SimulationRelated
            :initial_marking_cc, :simulation_settings_cc,
            to: :world
 
-  delegate :pm, to: :simulation
+  delegate :pm,
+           :recording,
+           to: :simulation
 
   # Pretty print the state.
   # 

data/lib/y_petri/dsl.rb

@@ -42,6 +42,8 @@ module YPetri
            :clamp_cc, :initial_marking_cc, :simulation_settings_cc,
            :simulation_point_position,
            :simulation,
+           :pm,                      # deleg. to simulation
+           :recording,               # deleg. to simulation
            :clamp_collection, :cc,
            :initial_marking_collection, :imc,
            :simulation_settings_collection, :ssc,

data/lib/y_petri/net/data_set.rb

@@ -41,12 +41,32 @@ class YPetri::Net::DataSet < Hash
     type == :timed
   end
 
-  # Returns a Record instance corresponding to the given recorded event.
+  # Returns the Record instance corresponding to the given recorded event.
   # 
   def record( event )
     features.load( fetch event )
   end
 
+  # Returns the nearest event smaller or equal to the supplied event-type
+  # argument. The second optional ordered argument, true by default, controls
+  # whether equality is accepted. If set to false, then the nearest _smaller_
+  # event is sought.
+  # 
+  def floor( event, equal_ok=true )
+    e = events.ascending_floor( event, equal_ok )
+    e.nil? ? nil : e
+  end
+
+  # Returns the nearest event greater or equal to the supplied event-type
+  # argument. The second optional ordered argument, true by default, controls
+  # whether equality is accepted. If set to false, then the nearest _greater_
+  # event is sought.
+  # 
+  def ceiling( event, equal_ok=true )
+    e = events.ascending_ceiling( event, equal_ok )
+    e.nil? ? nil : e
+  end
+
   # Revives records from values.
   # 
   def records
@@ -69,18 +89,49 @@ class YPetri::Net::DataSet < Hash
   # Record class instance.
   # 
   def interpolate( event )
-    # TODO: This whole interpolation thing is unfinished.
     begin
       record( event )
     rescue KeyError => msg
-      timed? or raise TypeError, "Event #{event} does not have a record! (%s)" %
+      timed? or raise TypeError, "Event #{event} not recorded! (%s)" %
         "simulation type: #{type.nil? ? 'nil' : type}"
-      f_time, floor = floor( event ) # timed datasets support floor, ceiling
-      c_time, ceiling = ceiling( time )
-      floor + ( ceiling - floor ) / ( c_time - f_time ) * ( time - f_time )
+      # (Remark: #floor, #ceiling supported by timed datasets only)
+      fe = floor( event )
+      fail "Event #{event} has no floor!" if fe.nil?
+      f = Matrix.column_vector record( fe )
+      ce = ceiling( event )
+      fail "Event #{event} has no ceiling!" if ce.nil?
+      c = Matrix.column_vector record( ce )
+      rslt = f + ( c - f ) / ( ce - fe ) * ( event - fe )
+      features.load( rslt.column_to_a )
     end
   end
 
+  # Resamples the recording.
+  # 
+  def resample **nn
+    time_range = nn.may_have( :time_range, syn!: :time ) ||
+      events.first .. events.last
+    sampling = nn.must_have :sampling
+    t0, target_time = time_range.begin, time_range.end
+    t = t0
+    loop.with_object self.class.new do |o|
+      o.update t => interpolate( t )
+      t += sampling
+      return o if t > target_time
+    end
+  end
+
+  # Computes the distance to another dataset.
+  # 
+  def distance( other )
+    sum_of_sq = events
+      .map { |e| [ e, other.interpolate( e ) ] }
+      .map { |rec1, rec2| rec1.euclidean_distance rec2 }
+      .map { |dist| dist * dist }
+      .reduce( :+ )
+    sum_of_sq ** 0.5
+  end
+
   # Returns the data series for the specified features.
   # 
   def series arg=nil

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

@@ -162,4 +162,12 @@ class YPetri::Net::State::Features::Record < Array
       end
     end
   end
+
+  # Computes the Euclidean distance from another record.
+  # 
+  def euclidean_distance other
+    sum_of_sq = features.map { |f|
+      fetch( f ) - other.fetch( f )
+    }.map { |dist| dist * dist }.reduce( :+ )
+  end
 end # class YPetri::Net::State::Features::Record

data/lib/y_petri/simulation.rb

@@ -97,7 +97,7 @@ class YPetri::Simulation
     m = settings[:marking]
     init_m = settings[:initial_marking] || {}
     use_default_marking = if settings.has? :use_default_marking then
-                            settings[:use_default_marking]
+                            settings[ :use_default_marking ]
                           else true end
     # Time-independent simulation settings received, constructing param. classes
     param_class!( { Place: PlaceRepresentation,

data/lib/y_petri/version.rb

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

metadata

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