y_petri 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4570f5c16ed669363e2f486537279b8fff18f13b
-  data.tar.gz: 493b757dc0e50e955a57d27531a1b820dd6eac04
+  metadata.gz: 5b2ecda77bfc45a49d215cf17020f630ee0f34be
+  data.tar.gz: a83ad616cf8cd540ed9823e6a42938b4617312ff
 SHA512:
-  metadata.gz: cfc80d5a5f74bb162055f19923658d64348ee5e69530bb6aeb2f1bd5cc7982c7cd549375a1f8a92d505cb66c374cb0963e461903924f96d2c19dfe5556553eab
-  data.tar.gz: d89389ec377ad6d26addc8c1369bdbc6eae27be4bd87b75190fcf25b07d7ccd35554b053e7ecf8f41e17aa386323cb8509cb43af96048502d93e2dd271593eaa
+  metadata.gz: 7ba1c8559c1fb4b906e176403bd4d015bc257535afc719f308cd658574fd5c7858a127d3ea138eac27f343dbffd66ebbb8c24f32a3a6a971e1bf121c16d32ed1
+  data.tar.gz: ab033d8eaabe98073c1d783450145232aaa09041947c66fa85b1069fe654a4c753f8372b948934f3b6523ceb0ba34fc7b3e2253ab103be3252be7df86230ea48

data/lib/y_petri/place/guard.rb

@@ -4,8 +4,8 @@
 # 
 class YPetri::Place::Guard
   ERRMSG = -> m, of, assert do
-    "Marking #{m}:#{m.class}" +
-      if of then " of #{of.name || of rescue of}" else '' end +
+    "Marking #{m.insp}" +
+      if of then " of #{of.name || of}" else '' end +
       " #{assert}!"
   end
 

data/lib/y_petri/place/guarded.rb

@@ -37,7 +37,7 @@ module YPetri::Place::Guarded
   # 
   def guard *args, &block
     if block then
-      @guards << YPetri::Place::Guard.new( *args, place: name || self, &block )
+      @guards << YPetri::Place::Guard.new( *args, place: self, &block )
     elsif args.size == 1 then
       federated_guard_closure.( args[0] )
     elsif args.empty? then

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
   DEBUG = false
 end

data/test/place_test.rb

@@ -8,78 +8,62 @@ require_relative '../lib/y_petri'     # tested component itself
 # require 'sy'
 
 describe YPetri::Place do
-  before do
-    @pç = pç = Class.new YPetri::Place
-    @p = pç.avid default_marking: 3.2,
-                 marking: 1.1,
-                 quantum: 0.1,
-                 name: "P1"
-  end
-
-  it "should support #name" do
-    assert_respond_to @p, :name
-    assert_equal @p.name, :P1
-  end
-
-  it "should have marking and related methods" do
-    @p.marking.must_equal 1.1 # Attention, #marking overloaded with guard setup!
-    @p.quantum.must_equal 0.1
-    @p.add 1
-    @p.value.must_equal 2.1   # near-alias of #marking (no guard setup)
-    @p.subtract 0.5
-    @p.m.must_equal 1.6       # alias of #value
-    @p.reset_marking
-    @p.marking.must_equal 3.2
-    @p.marking = 42
-    @p.m.must_equal 42
-    @p.m = 43
-    @p.m.must_equal 43
-    @p.value = 44
-    @p.m.must_equal 44
-  end
-
-  it "should have decent #inspect and #to_s methods" do
-    assert @p.inspect.start_with? "#<Place:"
-    assert @p.to_s.start_with? "#{@p.name}["
-  end
-
-  it "should have arc getter methods" do
-    @p.upstream_arcs.must_equal []
-    @p.upstream_transitions.must_equal [] # alias of #upstream_arcs
-    @p.ϝ.must_equal []                    # alias of #upstream_arcs
-    @p.downstream_arcs.must_equal []
-    @p.downstream_transitions.must_equal [] # alias of #downstream_arcs
-    @p.arcs.must_equal [] # all arcs
-    @p.precedents.must_equal []
-    @p.upstream_places.must_equal [] # alias for #precedents
-    @p.dependents.must_equal []
-    @p.downstream_places.must_equal [] # alias for #dependents
-  end
-
-  it "should have convenience methods to fire surrounding transitions" do
-    assert_respond_to @p, :fire_upstream
-    assert_respond_to @p, :fire_upstream!
-    assert_respond_to @p, :fire_downstream
-    assert_respond_to @p, :fire_downstream!
-    assert_respond_to @p, :fire_upstream_recursively
-    assert_respond_to @p, :fire_downstream_recursively
-  end
-
-  it "should have guard mechanics" do
-    @p.guards.size.must_equal 3 # working automatic guard construction
-    g1, g2 = @p.guards
+  it "should work" do
+    pç = Class.new YPetri::Place
+    p = pç.new default_marking: 3.2,
+               marking: 1.1,
+               quantum: 0.1,
+               name: "P1"
+    p.namespace.must_equal YPetri::Place
+    p.name.must_equal :P1
+    p.inspect[0..7].must_equal "#<Place:"
+    p.to_s[0..2].must_equal 'P1['
+    p.marking.must_equal 1.1 # Attention, #marking overloaded with guard setup!
+    p.quantum.must_equal 0.1
+    p.add 1
+    p.value.must_equal 2.1   # near-alias of #marking (no guard setup)
+    p.subtract 0.5
+    p.m.must_equal 1.6       # alias of #value
+    p.reset_marking
+    p.marking.must_equal 3.2
+    p.marking = 42
+    p.m.must_equal 42
+    p.m = 43
+    p.m.must_equal 43
+    p.value = 44
+    p.m.must_equal 44
+    p.upstream_arcs.must_equal []
+    p.upstream_transitions.must_equal [] # alias of #upstream_arcs
+    p.ϝ.must_equal []                    # alias of #upstream_arcs
+    p.downstream_arcs.must_equal []
+    p.downstream_transitions.must_equal [] # alias of #downstream_arcs
+    p.arcs.must_equal [] # all arcs
+    p.precedents.must_equal []
+    p.upstream_places.must_equal [] # alias for #precedents
+    p.dependents.must_equal []
+    p.downstream_places.must_equal [] # alias for #dependents
+    # fire methods
+    assert_respond_to p, :fire_upstream
+    assert_respond_to p, :fire_upstream!
+    assert_respond_to p, :fire_downstream
+    assert_respond_to p, :fire_downstream!
+    assert_respond_to p, :fire_upstream_recursively
+    assert_respond_to p, :fire_downstream_recursively
+    # guard mechanics
+    p.guards.size.must_equal 3 # working automatic guard construction
+    g1, g2 = p.guards
     [g1.assertion, g2.assertion].tap { |u, v|
       assert u.include?( "number" ) || u.include?( "Numeric" )
       assert v.include?( "complex" ) || v.include?( "Complex" )
     }
-    begin; g1.validate 11.1; g2.validate 11.1; @p.guard.( 11.1 ); :nothing_raised
+    begin; g1.validate 11.1; g2.validate 11.1; p.guard.( 11.1 ); :nothing_raised
     rescue; :error end.must_equal :nothing_raised
     -> { g2.validate Complex( 1, 1 ) }.must_raise YPetri::GuardError
-    @p.marking "must be in 0..10" do |m| fail unless ( 0..10 ) === m end
-    @p.guards.size.must_equal 4
-    g = @p.federated_guard_closure
+    p.marking "must be in 0..10" do |m| fail unless ( 0..10 ) === m end
+    p.guards.size.must_equal 4
+    g = p.federated_guard_closure
     -> { g.( 11.1 ) }.must_raise YPetri::GuardError
-    begin; @p.marking = -1.11; rescue YPetri::GuardError => err
+    begin; p.marking = -1.11; rescue YPetri::GuardError => err
       err.message.must_equal 'Marking -1.11:Float of P1 should not be negative!'
     end
   end

data/test/y_petri_test.rb

@@ -7,15 +7,6 @@ require_relative '../lib/y_petri' # tested component itself
 # require 'y_petri'
 # require 'sy'
 
-# Unit tests for the YPetri module.
-# 
-describe YPetri do
-  it "should have basic classes" do
-    [ :Place, :Transition, :Net, :Simulation, :World, :Agent ]
-      .each { |ß| YPetri.const_get( ß ).must_be_kind_of Module }
-  end
-end
-
 # Run all other unit tests.
 # 
 require_relative 'place_test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_petri
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: y_support