y_petri 2.1.3 → 2.1.6

data/test/net_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # encoding: utf-8
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require_relative '../lib/y_petri'     # tested component itself
 # require 'y_petri'
@@ -26,7 +26,7 @@ describe YPetri::Net do
       @net = @w.Net.new
     end
 
-    it "should work" do
+    it "should be able to include places" do
       p = @w.Place.new name: "A", quantum: 0.1, marking: 1.1
       @net.includes_place?( p ).must_equal false
       @net.include_place p
@@ -47,9 +47,6 @@ describe YPetri::Net do
 
     describe "net of 3 places and no transitions" do
       before do
-        # @p1.m = 1.1
-        # @p2.m = 2.2
-        # @p3.m = 3.3
         @net = @w.Net.of @p1, @p2, @p3
       end
 
@@ -59,27 +56,34 @@ describe YPetri::Net do
         assert_equal [], @net.transitions
       end
 
-      it "should expose transition groups" do
+      it "should allow only right transitions to be included in it" do
+        assert @net.include?( @p1 )
+        assert ! @net.include?( @p4 )
+        t = @w.Transition.new s: { @p4 => -1 }
+        -> { @net.include_transition t }.must_raise RuntimeError
+      end
+
+      it "should expose (thus far empty) transition groups" do
         assert_equal [], @net.S_transitions
         assert_equal [], @net.s_transitions
       end
 
-      it "should tell its qualities" do
-        assert_equal true, @net.functional?
+      it "should be able to tell its qualities" do
+        assert_equal false, @net.functional?
         assert_equal false, @net.timed?
         assert @net.include?( @p1 ) && !@net.include?( YPetri::Place.new )
       end
 
-      it "should have 'standard equipment' methods" do
+      it "should know its state and marking features" do
+        @net.state.must_equal [ @p1, @p2, @p3 ].map( &:marking )
+        @net.state.must_be_kind_of YPetri::Net::State
+        @net.marking.must_equal [ @p1, @p2, @p3 ].map( &:marking )
+        @net.marking.must_be_kind_of Array
+      end
+
+      it "should have standard equipment of a class" do
         assert @net == @net.dup
         assert @net.inspect.start_with? "#<Net:"
-        assert @net.include?( @p1 )
-        assert ! @net.include?( @p_not_included )
-        begin
-          @net.exclude_place! @p_not_included
-          @net.include_transition! YPetri::Transition.new( s: { @p_not_included => -1 } )
-          flunk "Attempt to include illegal transition fails to raise"
-        rescue; end
       end
 
       describe "plus 1 stoichio. transition with rate" do
@@ -123,6 +127,11 @@ describe YPetri::Net do
           @net.must_respond_to :simulation
         end
 
+        it "should know right flux, firing, gradient and delta features" do
+          @net.firing( [] ).must_equal []
+          -> { @net.firing }.must_raise TypeError
+        end
+
         it "should have other methods" do
           assert_equal [1.1, 2.2, 3.3], [@p1, @p2, @p3].map( &:marking ).map{ |n| n.round 6 }
           assert_equal 2.2 * 3.3 * 0.01, @t1.rate_closure.call( @p2.marking, @p3.marking )
@@ -164,7 +173,7 @@ describe YPetri::Net do
           end
 
           it "should tell its qualities" do
-            assert_equal false, @net.functional?
+            assert_equal true, @net.functional?
             assert_equal true, @net.timed?
             @net.exclude_transition @t2
             assert_equal true, @net.functional?
@@ -175,3 +184,18 @@ describe YPetri::Net do
     end
   end
 end
+
+
+describe YPetri::Net::State do
+  before do
+    @w = YPetri::World.new
+    @net = @w.Net.new
+  end
+
+  it "should be already parametrized on @w.Net" do
+    @St = @net.State
+    @St.net.must_equal @net
+    assert @St.Feature < YPetri::Net::State::Feature
+    -> { @St.feature( marking: :A ) }.must_raise NameError
+  end
+end

data/test/place_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # -*- coding: utf-8 -*-
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require_relative '../lib/y_petri'     # tested component itself
 # require 'y_petri'

data/test/simulation_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # encoding: utf-8
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require_relative '../lib/y_petri'     # tested component itself
 # require 'y_petri'
@@ -227,8 +227,9 @@ describe YPetri::Simulation do
           end
 
           it "should behave" do
-            @sim.recording.must_be_kind_of YPetri::Net::State::Features::Dataset
-            @sim.recording.must_equal @net.State.marking.new_dataset.update( 0.0 => [1, 2] )
+            @sim.recording.must_be_kind_of YPetri::Net::DataSet
+            @sim.recording
+              .must_equal @net.State.marking.new_dataset.update( 0.0 => [1, 2] )
             @sim.recording.must_equal( { 0.0 => [1, 2] } )
             @sim.step! 1
             @sim.recording.must_equal( { 0.0 => [1, 2], 1.0 => [2, 1] } )
@@ -252,7 +253,7 @@ describe YPetri::Simulation do
 end
 
 
-describe YPetri::Simulation do
+describe "timeless simulation" do
   before do
     self.class.class_exec { include YPetri }
     U = Place m!: 2.5
@@ -265,38 +266,42 @@ describe YPetri::Simulation do
   end
 
   it "should behave" do
-    simulation.tap do |s|
-      assert ! s.timed?
-      s.core.must_be_kind_of YPetri::Core::Timeless::PseudoEuler
-      s.recording.size.must_equal 6
-      s.recording.events.must_equal [0, 1, 2, 3, 4, 5]
-      s.recording.reconstruct( event: 2 ).pm.must_equal( { U: 2.5, V: 4.5 } )
-      s.recording.marking.slice( 2..4 ).series
-        .must_equal [[2.5, 2.5, 2.5], [4.5, 5.5, 6.5]]
-      s.recording.marking( slice: 2..4 )
-        .must_equal( { 2 => [2.5, 4.5],
-                       3 => [2.5, 5.5],
-                       4 => [2.5, 6.5] } )
-      s.recording.firing_series( slice: 1..2 )
-        .must_equal [[1, 1]]
-      s.recording.firing_series( transitions: [:U2V] )
-        .must_equal [[1, 1, 1, 1, 1, 1]]
-      s.recording.delta_series( places: [:U], transitions: [:Uplus] )
-        .must_equal [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]
-      tmp = s.recording.features( marking: [:U], firing: [:U2V] )
-      tmp.delete( :features )
-        .must_equal( { marking: [:U], firing: [:U2V],
-                       delta: { places: [], transitions: [] } } )
-      tmp.must_equal( { 0 => [2.5, 1], 1 => [2.5, 1], 2 => [2.5, 1],
-                        3 => [2.5, 1], 4 => [2.5, 1], 5 => [2.5, 1] } )
-    end
+    s = simulation
+    assert ! s.timed?
+    s.core.must_be_kind_of YPetri::Core::Timeless::PseudoEuler
+    ds = s.recording
+    ds.size.must_equal 6
+    ds.events.must_equal [0, 1, 2, 3, 4, 5]
+    ds.interpolate( 1 )
+      .must_equal [2.5, 3.5]
+    ds.interpolate( 2 )
+      .must_equal [2.5, 4.5]
+    -> { ds.interpolate( 1.5 ) }.must_raise TypeError
+    ds.reconstruct( event: 2 )
+      .pm.must_equal( { U: 2.5, V: 4.5 } )
+    ds.marking.slice( 2..4 ).series
+      .must_equal [[2.5, 2.5, 2.5], [4.5, 5.5, 6.5]]
+    ds.marking.slice( 2..4 )
+      .must_equal( { 2 => [2.5, 4.5],
+                     3 => [2.5, 5.5],
+                     4 => [2.5, 6.5] } )
+    ds.firing.slice( 1..2 ).series
+      .must_equal [[1, 1]]
+    ds.series( firing: [:U2V] )
+      .must_equal [[1, 1, 1, 1, 1, 1]]
+    ds.delta( [:U], transitions: [:Uplus] ).series
+      .must_equal [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]
+    tmp = ds.reduce_features( marking: [:U], firing: [:U2V] )
+    tmp.features
+      .must_equal( ds.net.State.features marking: [:U], firing: [:U2V] )
+    tmp.must_equal( { 0 => [2.5, 1], 1 => [2.5, 1], 2 => [2.5, 1],
+                      3 => [2.5, 1], 4 => [2.5, 1], 5 => [2.5, 1] } )
   end
 end
 
 
-describe YPetri::Simulation::Timed do
+describe "timed simulation" do
   before do
-    skip
     self.class.class_exec { include YPetri }
     A = Place m!: 0.5
     B = Place m!: 0.5
@@ -339,15 +344,10 @@ describe YPetri::Simulation::Timed do
         .must_equal []
       s.recording.firing
         .must_equal( [*0..12].map { |n| n * 5.0 } >> [[]] * 13 )
-      # It is obvious why this fails: Given delta feature is not in the
-      # recording. It has to be generated, and since the net is timed,
-      # it also requires Δt to be generated.
-
-      # I'll comment it out for a while to see what the plot is doing.
-=begin
-      s.recording.delta( [:A], transitions: [:A_pump] )
+      s.recording
+        .delta( [:A], transitions: [:A_pump], delta_time: 0.1 )
+        .series
         .must_equal [ [ -0.0005 ] * 13 ]
-=end
       plot_state
       sleep 5
     end

data/test/transition_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # encoding: utf-8
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require 'y_support/typing'
 

data/test/world_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # encoding: utf-8
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require_relative '../lib/y_petri'     # tested component itself
 # require 'y_petri'

data/test/y_petri_test.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 # encoding: utf-8
 
-require 'minitest/spec'
+gem 'minitest', '=4.7.4'
 require 'minitest/autorun'
 require_relative '../lib/y_petri'     # tested component itself
 # require 'y_petri'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: y_support
@@ -80,7 +80,9 @@ files:
 - lib/y_petri/dsl.rb
 - lib/y_petri/fixed_assets.rb
 - lib/y_petri/net.rb
+- lib/y_petri/net/data_set.rb
 - lib/y_petri/net/element_access.rb
+- lib/y_petri/net/own_state.rb
 - lib/y_petri/net/state.rb
 - lib/y_petri/net/state/feature.rb
 - lib/y_petri/net/state/feature/delta.rb
@@ -89,13 +91,13 @@ files:
 - lib/y_petri/net/state/feature/gradient.rb
 - lib/y_petri/net/state/feature/marking.rb
 - lib/y_petri/net/state/features.rb
-- lib/y_petri/net/state/features/dataset.rb
 - lib/y_petri/net/state/features/record.rb
 - lib/y_petri/net/timed.rb
 - lib/y_petri/net/visualization.rb
 - lib/y_petri/place.rb
 - lib/y_petri/place/arcs.rb
 - lib/y_petri/place/guard.rb
+- lib/y_petri/place/guarded.rb
 - lib/y_petri/simulation.rb
 - lib/y_petri/simulation/dependency.rb
 - lib/y_petri/simulation/element_representation.rb
@@ -147,13 +149,16 @@ files:
 - lib/y_petri/simulation/transitions/ts.rb
 - lib/y_petri/simulation/transitions/types.rb
 - lib/y_petri/transition.rb
+- lib/y_petri/transition/A.rb
+- lib/y_petri/transition/T.rb
 - lib/y_petri/transition/arcs.rb
-- lib/y_petri/transition/assignment.rb
 - lib/y_petri/transition/cocking.rb
-- lib/y_petri/transition/construction.rb
-- lib/y_petri/transition/init.rb
-- lib/y_petri/transition/ordinary_timeless.rb
-- lib/y_petri/transition/timed.rb
+- lib/y_petri/transition/construction_convenience.rb
+- lib/y_petri/transition/t.rb
+- lib/y_petri/transition/type.rb
+- lib/y_petri/transition/type_information.rb
+- lib/y_petri/transition/types.rb
+- lib/y_petri/transition/usable_without_world.rb
 - lib/y_petri/version.rb
 - lib/y_petri/world.rb
 - lib/y_petri/world/dependency.rb

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

@@ -1,135 +0,0 @@
-# encoding: utf-8
-
-class YPetri::Net::State
-  class Features
-    # Dataset is a collection of labeled state records.
-    # 
-    class Dataset < Hash
-      class << self
-        alias __new__ new
-
-        def new
-          __new__ do |hsh, missing|
-            case missing
-            when Float then nil
-            else hsh[ missing.to_f ] end
-          end
-        end
-      end
-
-      alias events keys
-      alias records values
-
-      delegate :features, to: "self.class"
-      delegate :net, to: :features
-      delegate :State, to: :net
-
-      # Revives records from values.
-      # 
-      def records
-        values.map { |value| features.Record.new( value ) }
-      end
-
-      # Recreates the simulation at a given event label.
-      # 
-      def reconstruct event: event, **settings # settings include marking clampls
-        interpolate( event ).reconstruct **settings
-      end
-
-      # Interpolates the recording an the given point (event).
-      # 
-      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!"
-          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 )
-        end
-      end
-
-      # 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
-
-      # Expects a hash of features (:marking (alias :state) of places, :firing
-      # of tS transitions, :delta of places and/or transitions) and returns the
-      # corresponding mapping of the recording.
-      # 
-      def reduce_features features
-        rf = net.State.features( features )
-        rr_class = rf.Record
-        rf.new_dataset.tap do |ds|
-        ( events >> records ).each_pair { |event, record|
-            ds.update event => rr_class.load( rf.map { |f| record.fetch f } )
-          }
-        end
-      end
-
-      def marking *args
-        return reduce_features features.select { |f| f.is_a? YPetri::Net::State::Feature::Marking } if args.empty?
-        reduce_features marking: args.first
-      end
-
-      def firing *args
-        return reduce_features features.select { |f| f.is_a? YPetri::Net::State::Feature::Firing } if args.empty?
-        reduce_features firing: args.first
-      end
-
-      def flux *args
-        return reduce_features features.select { |f| f.is_a? YPetri::Net::State::Feature::Flux } if args.empty?
-        reduce_features flux: args.first
-      end
-
-      def gradient *args
-        return reduce_features features.select { |f| f.is_a? YPetri::Net::State::Feature::Gradient } if args.empty?
-        reduce_features gradient: args
-      end
-
-      def delta *args
-        return reduce_features features.select { |f| f.is_a? YPetri::Net::State::Feature::Delta } if args.empty?
-        reduce_features delta: args
-      end
-
-      # Outputs the current recording in CSV format.
-      # 
-      def to_csv
-        map { |lbl, rec| [ lbl, *rec ].join ',' }.join "\n"
-      end
-
-      # Plots the dataset.
-      # 
-      def plot time: nil, **nn
-        events = events()
-        data_ss = series
-        x_range = if time.is_a? Range then
-                    "[#{time.begin}:#{time.end}]"
-                  else
-                    "[-0:#{SY::Time.magnitude( time ).amount rescue time}]"
-                  end
-        
-        Gnuplot.open do |gp|
-          Gnuplot::Plot.new gp do |plot|
-            plot.xrange x_range
-            plot.title nn[:title] || "#{net} plot"
-            plot.ylabel nn[:ylabel] || "Values"
-            plot.xlabel nn[:xlabel] || "Time [s]"
-
-            features.labels.zip( data_ss )
-              .each { |label, data_array|
-              plot.data << Gnuplot::DataSet.new( [ events, data_array ] ) { |ds|
-                ds.with = "linespoints"
-                ds.title = label
-              }
-            }
-          end
-        end
-      end
-    end # class Dataset
-  end # class Features
-end # YPetri::Simulation::State