y_petri 2.1.46 → 2.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7af28887341704a71e56203783fb4bddf63620
-  data.tar.gz: d54f85e5195a01293b15cdeed75d6bf0a61da35c
+  metadata.gz: dfddc6ced509606c4f4f8b4bd6fb55e17002f336
+  data.tar.gz: b1c0ba4a9b0cfa73ebeb6a0e7730e3dbb0b1ba31
 SHA512:
-  metadata.gz: 9ecc3db4760965a35f227361883969c8ed2718c24c257d2aade5edbbe2191c76bafc3f7f28a467937f0aa4d7a79b7246293f38d280de13a2ed8e58ce25275852
-  data.tar.gz: bcfa5add5ff22907980903ae337900976448841d3c4598288277964619be91fac81f707e9693a6f40879eff870331acae5337d8c737dff83906c6ab67b0d30be
+  metadata.gz: 12152cc39d1fc4259d56705fded129bb5c475d1223d949c8e6b58224670338c745989e1dacdb7ba4b4ce89b14b90310c8bf41bcd2e2dbe64842433c57de043f6
+  data.tar.gz: 460307f2c328568e56e3e384562bd2d2075d5987215fd0882964a91aa37708876cd3666b9880e4cb57b20745fe7e645358206b082f05b00e731121f4b058a3a6

data/lib/y_petri/net/visualization.rb

@@ -40,11 +40,31 @@ module YPetri::Net::Visualization
           if tr.stoichio[pl] > 0 then # producing arc
             γ.add_edges tr_node, place_nodes[pl], color: 'cyan'
           elsif tr.stoichio[pl] < 0 then # consuming arc
-            γ.add_edges place_nodes[pl], tr_node, color: 'cyan'
-          else
-            γ.add_edges place_nodes[pl], tr_node, color: 'grey', arrowhead: 'none'
+            γ.add_edges place_nodes[ pl ], tr_node, color: 'cyan'
+          else # zero stoichiometry => test arc
+            γ.add_edges place_nodes[ pl ], tr_node, color: 'grey', arrowhead: 'none'
           end
         }
+        ( tr.domain - tr.codomain ).each { |pl| # remaining test arcs
+          γ.add_edges tr_node, place_nodes[pl], color: 'grey', arrowhead: 'none'
+        }
+      elsif tr.S?
+        tr.codomain.each { |pl|
+          if tr.stoichio[pl] > 0 then # producing arc
+            γ.add_edges tr_node, place_nodes[pl], color: 'cyan'
+          elsif tr.stoichio[pl] < 0 then # consuming arc
+            γ.add_edges place_nodes[ pl ], tr_node, color: 'cyan'
+          else # zero stoichiometry => test arc
+            γ.add_edges place_nodes[ pl ], tr_node, color: 'grey', arrowhead: 'none'
+          end
+        }
+        ( tr.domain - tr.codomain ).each { |pl| # remaining test arcs
+          γ.add_edges tr_node, place_nodes[pl], color: 'grey', arrowhead: 'none'
+        }
+      else
+        tr.codomain.each { |pl|
+          γ.add_edges tr_node, place_nodes[pl], color: 'cyan'
+        }
         ( tr.domain - tr.codomain ).each { |pl|
           γ.add_edges tr_node, place_nodes[pl], color: 'grey', arrowhead: 'none'
         }

data/lib/y_petri/version.rb

@@ -1,4 +1,4 @@
 module YPetri
-  VERSION = "2.1.46"
+  VERSION = "2.1.47"
   DEBUG = false
 end

data/test/acceptance/visualization_test.rb

@@ -23,3 +23,18 @@ describe "Graphviz visualization" do
     @m.net.visualize
   end
 end
+
+describe "Another visualization" do
+  before do
+    class Object
+      include YPetri
+    end
+    A = Place()
+    B = Place()
+    A2B = Transition( s: { A: -1, B: 1 } )
+  end
+
+  it "should visualize as expected" do
+    net.visualize
+  end
+end

metadata

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