y_petri 2.1.49 → 2.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c5465498bf59a661b74aa844eefe5819f03e50e
-  data.tar.gz: f10f11a40888ab580f4085a51ade994e3acb2a72
+  metadata.gz: 07695fc1b0877e3f17285581c526067846e37333
+  data.tar.gz: 7c7445c48f5803b021e7d1689f51d0eae2adfff2
 SHA512:
-  metadata.gz: 0c4a841992fb937e28f71c27d3f83b89d97d730893935f3c3f32dc710106be7f6c0f9a7309e62ad459f39ca0596f6cd4d4a18facd7053340b4f5c6b1d1c1f6fb
-  data.tar.gz: 47563d634cf328ce4460b1c5a3e26ced1ef8707afbaab7e884ca0948e6e86979284c1770ed2ecc8324d30519b4fda13778dac1f72ce9759b252240ea0d4a84f7
+  metadata.gz: 81b8ba81ab47a6782efdeef2e1add45ffebaec2112116aa3f85e0c1293b26521005ed3b7f394fb459e7a33c65172419170256da19c469a1693794a780d0e29d0
+  data.tar.gz: 79a23f7e0c5e6fe82c24b037a3d3f8b44fb26ed03c55fb6d678b0b52c3977c3e65227a3be8679d4556bb5013575886eeaacb9fd08ff56f21863bc8ce07d27c8d

data/lib/y_petri/transition/construction_convenience.rb

@@ -21,9 +21,11 @@ module YPetri::Transition::ConstructionConvenience
                                    :downstream,
                                    :downstream_arcs, :downstream_places,
                                    :action_arcs ]
-    nn.may_have :rate, syn!: [ :rate_closure, :propensity,
+    nn.may_have :rate, syn!: [ :rate_closure,
+                               :propensity,
                                :propensity_closure ]
     nn.may_have :action, syn!: :action_closure
+    nn.may_have :assignment, syn!: :assignment_closure
     nn.may_have :stoichiometry, syn!: [ :stoichio, :s ]
     nn.may_have :domain_guard
     nn.may_have :codomain_guard
@@ -34,6 +36,9 @@ module YPetri::Transition::ConstructionConvenience
     # If stoichiometry was given, the transition is stoichiometric:
     @stoichiometric = nn.has? :stoichiometry
 
+    # If the assignment closure was given, the transition is of A type:
+    @assignment_action = __assignment_action__( **nn )
+
     # Downstream description involves the codomain, and the stochiometry
     # (for stoichiometric transitions only):
     if stoichiometric? then
@@ -52,12 +57,13 @@ module YPetri::Transition::ConstructionConvenience
     if timed? then
       @domain, @rate_closure, @functional = __upstream_for_T__( **nn )
     else
-      @domain, @action_closure, @functional = __upstream_for_t__( **nn )
+      if assignment_action? then
+        @domain, @action_closure, @functional = __upstream_for_A__( **nn )
+      else
+        @domain, @action_closure, @functional = __upstream_for_t__( **nn )
+      end
     end
 
-    # Optional assignment action:
-    @assignment_action = __assignment_action__( **nn )
-
     # Optional type guards for domain / codomain:
     @domain_guard, @codomain_guard = __guards__( **nn )
   end
@@ -139,7 +145,7 @@ module YPetri::Transition::ConstructionConvenience
     funct = true                     # "functional?"
     # Was action given explicitly?
     if nn.has? :action then
-      λ = nn[:action].aT_is_a Proc, "supplied action named argument"
+      λ = nn[:action].aT_is_a Proc, "supplied :action argument"
       # Time to worry about the domain_missing, guess the user's intention:
       if dom == :missing then
         dom = λ.arity == 0 ? [] : codomain
@@ -156,6 +162,21 @@ module YPetri::Transition::ConstructionConvenience
     end
     return dom, λ, funct
   end
+
+  # Private method, part of the init process for assignment transitions.
+  # 
+  def __upstream_for_A__( **nn )
+    dom = domain
+    funct = true
+    λ = nn[:assignment].aT_is_a Proc, "supplied :assigmnent argument"
+    if dom == :missing then
+      dom = λ.arity == 0 ? [] : codomain
+    else
+      msg = "Assignment closure arity (#{λ.arity}) > domain (#{dom.size})!"
+      fail TypeError, msg if λ.arity.abs > dom.size
+    end
+    return dom, λ, funct
+  end
   
   # Default rate closure for SR transitions whose rate is hinted as a number.
   # 
@@ -214,13 +235,16 @@ module YPetri::Transition::ConstructionConvenience
   # Private method, part of #initialize argument checking-in.
   # 
   def __assignment_action__( **oo )
-    if oo.has? :assignment_action, syn!: [ :assignment, :assign, :A ] then
+    if oo.has? :assignment then
       if timed? then
         false.tap do
-          msg = "Timed transitions may not have assignment action!"
-          raise TypeError, msg if oo[:assignment_action]
+          fail TypeError, "Timed transitions may not have assignment action!"
+        end
+      elsif stoichiometric? then
+        false.tap do
+          fail TypeError, "S transitions may not have assignment action!"
         end
-      else oo[:assignment_action] end # only timeless transitions are eligible
+      else true end # ts transition with assignment keyword
     else false end # the default value
   end
 

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.49"
+  VERSION = "2.1.50"
   DEBUG = false
 end

data/test/net_test.rb

@@ -47,7 +47,7 @@ describe YPetri::Net do
 
     describe "net of 3 places and no transitions" do
       before do
-        @net = @w.Net.of @p1, @p2, @p3
+        @net = @w.Net.of [ @p1, @p2, @p3 ]
       end
 
       it "should expose its elements" do

data/test/simulation_test.rb

@@ -25,7 +25,7 @@ describe YPetri::Simulation do
     before do
       @p = @w.Place.send :new, name: :A, default_marking: 1
       @q = @w.Place.send :new, name: :B, default_marking: 2
-      @net = @w.Net.of @p, @q
+      @net = @w.Net.of [ @p, @q ]
     end
 
     it "should allow to set up a simplistic simulation instance" do
@@ -104,7 +104,7 @@ describe YPetri::Simulation do
 
       describe "ts transition" do
         before do
-          @net = @w.Net.of @p, @q, @ts
+          @net = @w.Net.of [ @p, @q, @ts ]
         end
 
         describe "no clamps" do
@@ -154,7 +154,7 @@ describe YPetri::Simulation do
 
       describe "tS transition" do
         before do
-          @net = @w.Net.of @p, @q, @tS
+          @net = @w.Net.of [ @p, @q, @tS ]
         end
 
         describe "no clamps" do
@@ -184,7 +184,7 @@ describe YPetri::Simulation do
 
       describe "Ts transition" do
         before do
-          @net = @w.Net.of @p, @q, @Ts
+          @net = @w.Net.of [ @p, @q, @Ts ]
         end
 
         describe "no clamps" do
@@ -219,7 +219,7 @@ describe YPetri::Simulation do
 
       describe "TS transition" do
         before do
-          @net = @w.Net.of @p, @q, @TS
+          @net = @w.Net.of [ @p, @q, @TS ]
         end
 
         describe "no clamps" do
@@ -305,7 +305,7 @@ describe "timed simulation" do
     self.class.class_exec { include YPetri }
     A = Place m!: 0.5
     B = Place m!: 0.5
-    A_pump = T s: { A: -1 } do 0.005 end
+    A_pump = TT s: { A: -1 } do 0.005 end
     B_decay = Transition s: { B: -1 }, rate: 0.05
     run!
   end

data/test/transition_test.rb

@@ -210,7 +210,7 @@ describe "upstream and downstream reference mτs of places and transitions" do
   describe "assignment action transitions" do
     before do
       @p = @pç.send :new, default_marking: 1.0
-      @t = @tç.send :new, codomain: @p, action: -> { 1 }, assignment_action: true
+      @t = @tç.send :new, codomain: @p, assignment_closure: -> { 1 }
     end
 
     it "should work" do

metadata

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