petri_net 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac9fa5977f53b289d5fc97d42c14a2847b80c9c
-  data.tar.gz: d66436746d5f190ef3bf3c8361242ecb71dd5d6f
+  metadata.gz: fce9fbf19b7836a63649d8b2e2ff923d6b130952
+  data.tar.gz: 0f5a0486c67ede47a093743fe16a1da43b6a5900
 SHA512:
-  metadata.gz: b1e585661a11b0ab1789454a4f401d85de55fecbafdf913663083f06c23d2686cbb9ba6e98e7db810358f78514aa998af8ad6be448ffae2480cb81c2aab6ba8a
-  data.tar.gz: 3fbcf881036c7f18f87f14b0b21d226bfcc81b14e33ea772c9d716cda5b5dcdd805949e2c54f825d57f3ca04f8e03b487208e21f4a6fbbd4ea420f5f2fc9aa79
+  metadata.gz: 3355739df8da5232040bc7b46b156f4d72ceaff55baba294c55d103c0410a1614920a5ca5afd5b141b1798c8bd1840d4d4b0bc36b40900019c87a9d43ed1bd17
+  data.tar.gz: 5a0a766e885d3dde361311d982a1624284441558ff9d617a62aa026042fa630ac1a95b7c4c5d260f6ceb93d1c67e75f99c75b5b39b08e216019f7c9c8202834e

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/lib/petri_net/net.rb

@@ -294,6 +294,10 @@ Arcs
         @net = YAML.load(File.read(filename))
     end
 
+    def fire transition
+        get_transition(transition).fire
+    end
+
     private
 
     def changed_structure
@@ -312,7 +316,7 @@ Arcs
                 current_node_id = @graph.add_node current_node 
                 @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: current_node, probability: @objects[tid].probability) unless current_node_id < 0
                 if current_node_id < 0 && @graph.get_node(current_node_id * -1) < current_node
-                    @graph.getNode(current_node_id * -1).add_omega current_node
+                    @graph.get_node(current_node_id * -1).add_omega current_node
                 end
                 reachability_helper get_markings, current_node unless (current_node_id < 0)
             end

data/lib/petri_net/place.rb

@@ -96,7 +96,7 @@ class PetriNet::Place < PetriNet::Base
 
     # Stringify this place.
     def to_s
-        "#{@id}: #{@name} (#{@capacity == nil ? -1 : 0})"
+        "#{@id}: #{@name} (#{@capacity == nil ? -1 : 0}) #{'*' * @markings.length}"
     end
 
     # GraphViz definition

data/lib/petri_net/reachability_graph/graph.rb

@@ -15,11 +15,14 @@ class PetriNet::ReachabilityGraph < PetriNet::Base
     end
 
     def add_node(node)
+        double = false
         @nodes.each_value do |n|
             begin
                 if node > @objects[n]
                     if @unlimited
-                        return @objects[n].id *-1
+                        double = n
+                        break
+                        #return @objects[n].id *-1
                     else
                         raise PetriNet::ReachabilityGraph::InfiniteReachabilityGraphError
                     end
@@ -28,6 +31,7 @@ class PetriNet::ReachabilityGraph < PetriNet::Base
                 #just two different markings, completly ok
             end
         end
+        return (@objects[double].id * -1) if double
         node_index = @objects.index node
         if (!node_index.nil?)
             return @objects[node_index].id * -1

data/lib/petri_net/reachability_graph/node.rb

@@ -41,11 +41,11 @@ class PetriNet::ReachabilityGraph::Node < PetriNet::Base
     # Add an omega-marking to a specified place
     def add_omega object 
         if object.class.to_s == "PetriNet::ReachabilityGraph::Node"
-            if self > object
+            if self < object
                 counter = 0
                 object.markings.each do |marking|
                     if @markings[counter] < marking 
-                        @markings[counter] = Fload::INFINITY 
+                        @markings[counter] = Float::INFINITY 
                     end
                     counter += 1
                 end

data/lib/petri_net/version.rb

@@ -1,6 +1,6 @@
 module PetriNet
     # Current Version
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
     # True if this is a debug-version and should not be used in productive systems
     DEBUG = false
 end

data/test/reachability_graph/tc_node.rb

@@ -1,12 +1,8 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
 require 'logger'
 require 'test/unit'
 require "#{File.dirname(__FILE__)}/../../lib/petri_net" 
 
-#require 'pry'
-
 class TestReachabilityGraphNode < Test::Unit::TestCase
     def setup
         @net = PetriNet::Net.new(:name => 'Water', :description => 'Creation of water from base elements.')

data/test/tc_petri_net.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
 require 'logger'
 require 'test/unit'
@@ -24,6 +22,62 @@ class TestPetriNet < Test::Unit::TestCase
         @net << arc 
     end
 
+    def complex_net
+        @net << PetriNet::Place.new(:name => "P1")
+        @net << PetriNet::Place.new(:name => "P2")
+        @net << PetriNet::Place.new(:name => "C1")
+        @net << PetriNet::Place.new(:name => "C2")
+        @net << PetriNet::Place.new(:name => "buffer")
+        @net << PetriNet::Transition.new(:name => "produce")
+        @net << PetriNet::Transition.new(:name => "consume")
+        @net << PetriNet::Transition.new(:name => "put")
+        @net << PetriNet::Transition.new(:name => "take")
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_place 'P1')
+            a.add_destination(@net.get_transition 'produce')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_transition 'produce')
+            a.add_destination(@net.get_place 'P2')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_place 'P2')
+            a.add_destination(@net.get_transition 'put')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_transition 'put')
+            a.add_destination(@net.get_place 'P1')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_transition 'put')
+            a.add_destination(@net.get_place 'buffer')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_place 'buffer')
+            a.add_destination(@net.get_transition 'take')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_transition 'take')
+            a.add_destination(@net.get_place 'C1')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_place 'C1')
+            a.add_destination(@net.get_transition 'consume')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_transition 'consume')
+            a.add_destination(@net.get_place 'C2')
+        end
+        @net <<  PetriNet::Arc.new do |a|
+            a.add_source(@net.get_place 'C2')
+            a.add_destination(@net.get_transition 'take')
+        end
+
+        @net.get_place('P1').add_marking
+        @net.get_place('buffer').add_marking
+        @net.get_place('C2').add_marking
+    end
+
     def teardown
         @net.reset
     end
@@ -43,6 +97,13 @@ class TestPetriNet < Test::Unit::TestCase
         assert_empty net.get_markings, "No Places should mean no markings..."
     end
 
+    def test_complex_net
+        complex_net
+        assert_equal "Petri Net [Water]\n----------------------------\nDescription: Creation of water from base elements.\nFilename: Water\n\nPlaces\n----------------------------\n1: P1 (0) *\n2: P2 (0) \n3: C1 (0) \n4: C2 (0) *\n5: buffer (0) *\n\nTransitions\n----------------------------\n6: produce\n7: consume\n8: put\n9: take\n\nArcs\n----------------------------\n10: Arc10 (1) 1 -> 6\n11: Arc11 (1) 6 -> 2\n12: Arc12 (1) 2 -> 8\n13: Arc13 (1) 8 -> 1\n14: Arc14 (1) 8 -> 5\n15: Arc15 (1) 5 -> 9\n16: Arc16 (1) 9 -> 3\n17: Arc17 (1) 3 -> 7\n18: Arc18 (1) 7 -> 4\n19: Arc19 (1) 4 -> 9\n\n", @net.to_s
+        assert_equal "digraph Water {\n\t// General graph options\n\trankdir = LR;\n\tsize = \"10.5,7.5\";\n\tnode [ style = filled, fillcolor = white, fontsize = 8.0 ]\n\tedge [ arrowhead = vee, arrowsize = 0.5, fontsize = 8.0 ]\n\n\t// Places\n\tnode [ shape = circle ];\n\tP1 [ label = \"P1 1  \" ];\n\tP2 [ label = \"P2 0  \" ];\n\tP3 [ label = \"C1 0  \" ];\n\tP4 [ label = \"C2 1  \" ];\n\tP5 [ label = \"buffer 1  \" ];\n\n\t// Transitions\n\tnode [ shape = box, fillcolor = grey90 ];\n\tT6 [ label = \"produce\" ];\n\tT7 [ label = \"consume\" ];\n\tT8 [ label = \"put\" ];\n\tT9 [ label = \"take\" ];\n\n\t// Arcs\n\tP1 -> T6 [ label = \"Arc10\", headlabel = \"1\" ];\n\tT6 -> P2 [ label = \"Arc11\", headlabel = \"1\" ];\n\tP2 -> T8 [ label = \"Arc12\", headlabel = \"1\" ];\n\tT8 -> P1 [ label = \"Arc13\", headlabel = \"1\" ];\n\tT8 -> P5 [ label = \"Arc14\", headlabel = \"1\" ];\n\tP5 -> T9 [ label = \"Arc15\", headlabel = \"1\" ];\n\tT9 -> P3 [ label = \"Arc16\", headlabel = \"1\" ];\n\tP3 -> T7 [ label = \"Arc17\", headlabel = \"1\" ];\n\tT7 -> P4 [ label = \"Arc18\", headlabel = \"1\" ];\n\tP4 -> T9 [ label = \"Arc19\", headlabel = \"1\" ];\n}\n", @net.to_gv 
+        assert_equal "digraph Water {\n\t// General graph options\n\trankdir = LR;\n\tsize = \"10.5,7.5\";\n\tnode [ style = filled, fillcolor = white, fontsize = 8.0 ]\n\tedge [ arrowhead = vee, arrowsize = 0.5, fontsize = 8.0 ]\n\n\t// Nodes\n\tnode [ shape = circle ];\n\tN20 [ label = \"[1, 0, 0, 1, Infinity]\" ];\n\tN21 [ label = \"[0, 1, 0, 1, 1]\" ];\n\tN24 [ label = \"[0, 1, 1, 0, 0]\" ];\n\tN26 [ label = \"[0, 1, 0, 1, Infinity]\" ];\n\tN28 [ label = \"[1, 0, 0, 1, 1]\" ];\n\tN31 [ label = \"[1, 0, 1, 0, Infinity]\" ];\n\tN34 [ label = \"[1, 0, 0, 1, Infinity]\" ];\n\tN36 [ label = \"[0, 1, 0, 1, 0]\" ];\n\tN40 [ label = \"[1, 0, 1, 0, 0]\" ];\n\tN43 [ label = \"[1, 0, 0, 1, 0]\" ];\n\n\t// Edges\n\tN20 -> N21;\n\tN21 -> N24;\n\tN24 -> N26;\n\tN26 -> N28;\n\tN28 -> N31;\n\tN31 -> N34;\n\tN34 -> N36;\n\tN20 -> N40;\n\tN40 -> N43;\n}\n", @net.generate_reachability_graph.to_gv
+    end
+
     def test_add_place
         # Create the place
         place = PetriNet::Place.new(:name => 'Hydrogen')
@@ -176,25 +237,7 @@ class TestPetriNet < Test::Unit::TestCase
             a.add_destination(net2.get_transition 'testtrans')
         end
         net2 << arc
-        assert_equal "Petri Net [Water]
-----------------------------
-Description: Creation of water from base elements.
-Filename: Water
-
-Places
-----------------------------
-1: testplace (0)
-4: testplace2 (0)
-
-Transitions
-----------------------------
-2: testtrans
-
-Arcs
-----------------------------
-3: testarc (2) 1 -> 2
-
-", @net.merge(net2).to_s, "Merge failed, this is only a basic test"
+        assert_equal "Petri Net [Water]\n----------------------------\nDescription: Creation of water from base elements.\nFilename: Water\n\nPlaces\n----------------------------\n1: testplace (0) \n4: testplace2 (0) \n\nTransitions\n----------------------------\n2: testtrans\n\nArcs\n----------------------------\n3: testarc (2) 1 -> 2\n\n", @net.merge(net2).to_s, "Merge failed, this is only a basic test"
     end
 
     def test_generate_reachability_graph

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petri_net
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - cclausen
@@ -31,11 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .ruby-version
 - .travis.yml
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile

data/Gemfile.lock

@@ -1,18 +0,0 @@
-PATH
-  remote: .
-  specs:
-    petri_net (0.7.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  net-sftp
-  petri_net!