y_petri 2.1.37 → 2.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8bd3d0de26cf79301633503c11a780226ec1e1b
-  data.tar.gz: a8da1ce1d92d383d917116dde22356b97a42aabf
+  metadata.gz: ebb46216e3628b410a2044e7e70c45bf30c2171b
+  data.tar.gz: 8a784e74c722d887fcde91472b535b8ae851aaf9
 SHA512:
-  metadata.gz: 76b36988750b6ba018af3efe5f33a2017838d702a49331b8e529b05149cfbff662d78e2eeaa02dfb9f3971956be04a597483c4efb4173aa49799d946a3419eb1
-  data.tar.gz: 26d6113132e1154ba1a534429316a61382f62e88d7574a6f28339d8b220e9388bd278286011f92e10f5baef4670fb0e59db1bd1d749ce794670e71a874062bf7
+  metadata.gz: 203b23f6e4e783adf8b2c0c26e3b9bdb9f4a51e858eaf8a980ac88d6218c9d8ef313c7eafe641d8a76d07d689a5af24fed3d546f9e11fd6f12d8025163c1c5a7
+  data.tar.gz: 351303f21b5dca23a3ff11102ee50a338c89465b817961d17c2af61e3b8b2f209633d9d18c55c44d92aced8721002838832ea9edb250c78cba6d4949e9a2a865

data/lib/y_petri/net/data_set.rb

@@ -259,14 +259,30 @@ class YPetri::Net::DataSet < Hash
     map { |lbl, rec| [ lbl, *rec ].join ',' }.join "\n"
   end
 
-  # Plots the dataset. Takes several optional arguments: The list of features
-  # to plot as the first ordered argument, 
+  # Plots the dataset. Takes several optional arguments: The list of elements
+  # can be supplied as optional first ordered argument, which are then converted
+  # into features using +Net::State::Features.infer_from_elements+ method.
+  # Similarly, the features to exclude can be specifies as a list of elements
+  # (or a feature-specifying hash) supplied under +except:+ keyword. Otherwise,
+  # feature specification can be passed to the method as named arguments. If
+  # no feature specification is explicitly provided, it is assumed that all the
+  # features of this dataset are meant to be plotted.
   # 
-  def plot( feature_ids=nil, time: nil, except: [], **nn )
+  def plot( element_ids=nil, time: nil, except: [], **nn )
     time = nn.may_have :time, syn!: :time_range
     events = events()
-    ff = feature_ids.nil? ? features : net.state.features( feature_ids )
-    ff -= net.state.features( except )
+    if element_ids.nil? then
+      ff = if nn.empty? then features else net.State.features( nn ) end
+    else
+      ff = net.State.Features.infer_from_elements( element_ids )
+    end
+    xff = case except
+          when Array then net.State.Features.infer_from_elements( except )
+          when Hash then net.State.features( except )
+          else
+            fail TypeError, "Wrong type of :except argument: #{except.class}"
+          end
+    ff -= xff
     data_ss = series( ff )
     x_range = if time.nil? then
                 from = events.first || 0

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

@@ -147,6 +147,7 @@ class YPetri::Net::State::Feature::Delta < YPetri::Net::State::Feature
   # Inspect string of the delta feature.
   # 
   def inspect
-    "<Feature::Delta Δ:#{place.name || place}:#{transitions.size}tt>"
+    "<Feature::Delta Δ:#{place.name || place}:[%s]>" %
+      transitions.names( true ).join( ', ' )
   end
 end # class YPetri::Net::State::Feature::Delta

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

@@ -87,6 +87,6 @@ class YPetri::Net::State::Feature::Firing < YPetri::Net::State::Feature
   # Inspect string of the firing feature.
   # 
   def inspect
-    "<Feature::Firing of #{transition}>"
+    "<Feature::Firing of #{transition.name ? transition.name : transition}>"
   end
 end # YPetri::Net::State::Feature::Firing

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

@@ -87,6 +87,6 @@ class YPetri::Net::State::Feature::Flux < YPetri::Net::State::Feature
   # Inspect string of the flux feature.
   # 
   def inspect
-    "<Feature::Flux of #{transition}>"
+    "<Feature::Flux of #{transition.name ? transition.name : transition}>"
   end
 end # class YPetri::Net::State::Feature::Flux

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

@@ -99,6 +99,7 @@ class YPetri::Net::State::Feature::Gradient < YPetri::Net::State::Feature
   # Inspect string of the gradient feature.
   # 
   def inspect
-    "<Feature::Gradient ∂:#{place.name || place}:#{transitions.size}tt>"
+    "<Feature::Gradient ∂:#{place.name || place}:[%s]>" %
+      transitions.names( true ).join( ', ' )
   end
 end # class YPetri::Net::State::Feature::Gradient

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

@@ -59,6 +59,7 @@ class YPetri::Net::State::Feature::Marking < YPetri::Net::State::Feature
   def extract_from arg, **nn
     case arg
     when YPetri::Simulation then
+      # now we have to investigate the case when place.name is A_phase, why the heck does it fail
       arg.m( [ place ] ).first
     else
       fail TypeError, "Argument type not supported!"
@@ -86,6 +87,6 @@ class YPetri::Net::State::Feature::Marking < YPetri::Net::State::Feature
   # Inspect string of the marking feature.
   # 
   def inspect
-    "<Feature::Marking of #{place}>"
+    "<Feature::Marking of #{place.name ? place.name : place}>"
   end
 end # YPetri::Net::State::Feature::Marking

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

@@ -41,7 +41,8 @@ class YPetri::Net::State::Features::Record < Array
     super begin
             Integer( feature )
           rescue TypeError
-            features.index State().feature( feature )
+            feat = State().feature( feature )
+            features.index( feat )
           end
   end
 

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

@@ -110,6 +110,29 @@ class YPetri::Net::State::Features < Array
         new arg.map { |id| Delta id, transitions: transitions }
       end
     end
+
+    # Takes an array of the net elements (places and/or transitions), and infers
+    # a feature set from them in the following way: Places or place ids are
+    # converted to marking features. The remaining array elements are treated
+    # as transition ids, and are converted to either flux features (if the
+    # transition is timed), or firing features (if the transition is timeless).
+    # 
+    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 ]
+                                end
+        case element_type
+        when :place then Marking( element )
+        when :transition then
+          fail TypeError, "Flux / firing features can only be auto-inferred " +
+            "from S transitions! (#{element} was given)" unless element.S?
+          element.timed? ? Flux( element ) : Firing( element )
+        end
+      }
+    end
   end
 
   delegate :State,
@@ -131,7 +154,14 @@ class YPetri::Net::State::Features < Array
   # Extracts the features from a given target
   # 
   def extract_from target, **nn
-    new_record( map { |feature| feature.extract_from( target, **nn ) } )
+    values = map { |feat| feat.extract_from( target, **nn ) }
+    new_record( values )
+  end
+
+  # Constructs a new record from these features.
+  # 
+  def new_record values
+    Record().load values
   end
 
   # Constructs a new dataset from these features.
@@ -176,7 +206,6 @@ class YPetri::Net::State::Features < Array
 
   # Returns the subset of marking features.
 
-
   # Expects a marking feature identifier (place identifier or Marking instance),
   # and returns the corresponding feature from this feature set. If an array of
   # marking feature identifiers is supplied, it is mapped to the array of

data/lib/y_petri/net/state.rb

@@ -29,6 +29,8 @@ class YPetri::Net::State < Array
     # Returns the feature identified by the argument.
     # 
     def feature *id
+      puts "Hello from Net::State.feature. id is:"
+      Kernel::p id
       fail ArgumentError, "No feature identifier!" if id.empty?
       case id.first
       when Feature() then id.first

data/lib/y_petri/simulation/marking_vector.rb

@@ -94,8 +94,11 @@ class YPetri::Simulation
     def reset! arg=self.class.starting
       case arg
       when Hash then
-        mapping = simulation.PlaceMapping().load( arg )
-        reset! places.map { |pl| mapping[ pl ] }
+        mp = simulation.PlaceMapping().load( arg )
+        updated = mp.each_with_object self.class.starting do |(place, value), mv|
+          mv.set place, value
+        end
+        reset! updated.column_to_a
       else # array arg assumed
         arg.each.to_a.zip( annotation ).map { |value, place| set place, value }
       end

data/lib/y_petri/simulation/timed/recorder.rb

@@ -43,12 +43,7 @@ module YPetri::Simulation::Timed
       t2 = next_time.round( 9 )
       if t >= t2 then # it's time to sample
         sample!
-        begin
-          @next_time += sampling
-        rescue NoMethodError => err
-          ( puts "Here go error #{err}"; Kernel::p @next_time; Kernel::p sampling )
-        end
-                                      
+        @next_time += sampling
       end
     end
 

data/lib/y_petri/simulation.rb

@@ -115,7 +115,8 @@ class YPetri::Simulation
                     PlaceMapping: PlaceMapping,
                     InitialMarking: InitialMarking,
                     MarkingClamps: MarkingClamps,
-                    MarkingVector: MarkingVector }, with: { simulation: self } )
+                    MarkingVector: MarkingVector },
+                  with: { simulation: self } )
     # Place and transition representation classes are their own namespaces.
     Place().namespace!
     Transition().namespace!
@@ -132,8 +133,8 @@ class YPetri::Simulation
     # Correspondence matrix clamped --> all
     @c2a = clamped_places.correspondence_matrix( places )
     # Conditionally extend self depending on net's timedness.
-    extend( settings[:time] || settings[:step] || settings[:sampling] ?
-            Timed : Timeless )
+    anything_time = settings[:time] || settings[:step] || settings[:sampling]
+    extend( anything_time ? Timed : Timeless )
     # Initialize the marking vector.
     @m_vector = MarkingVector().zero
     # Set up the transitions collection.

data/lib/y_petri/version.rb

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

metadata

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