petri_net 0.7.9.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424a324ddce6aa016935fbf72566df141a908ac0
-  data.tar.gz: f642d0f9451834d2d4ceb602c56ee2ade52e649c
+  metadata.gz: 6280711333c42af2d42f9f72dc8d7e9addf491d0
+  data.tar.gz: 0f5c88804ad2453ac2ac5f58ed48b402e6a46332
 SHA512:
-  metadata.gz: 203e591a97198ae311563099b29305b0499f16024e57984a9152dff16fa929739e049a9ef00e6c0f0c58f61f67df3ff440e1e57960fc7d1026774fed0c8583df
-  data.tar.gz: 21a108f4151259a0e9bdefaa693e93b777524b13971b6fd8d61142c81f8c1e5956889458b2ff46c7196651e9f72fc2fbadd84c51690410bc833516d8f4ba08c9
+  metadata.gz: d11cb20273590228cc3324d6e5483eb6f6d79fb2cf8e3217200fb86e4464d511126eb2c9a2843c11ec8f69a54ff061d63f3c4037fd9b7c637dabe749eda05d4c
+  data.tar.gz: 4bf91f1daf2975b146139be896386cc1704d393f33d3d4936afc4e7e607b97ad214d09c674dd6c189c3b51b5a25a323308a78a8201bcc7e3ba5ad249c530f0b1

data/lib/petri_net/graph/edge.rb

@@ -15,7 +15,8 @@ class PetriNet::Graph::Edge < PetriNet::Base
     attr_reader :transition
     
     # Creates an edge for PetriNet::Graph
-    def initialize(options = {}, &block)
+    def initialize(graph, options = {}, &block)
+        @graph = graph
         @id = next_object_id
         @name = (options[:name] or "Edge#{@id}")
         @description = (options[:description] or "Edge #{@id}")

data/lib/petri_net/graph/graph.rb

@@ -4,7 +4,12 @@ class PetriNet::InfiniteReachabilityGraphError < RuntimeError
 end
 
 class PetriNet::Graph < PetriNet::Base
+
+    # The PetriNet this graph belongs to
+    attr_reader :net
+
     def initialize(net, options = Hash.new)
+        @net = net
         @objects = Array.new
         @nodes = Hash.new
         @edges = Hash.new
@@ -55,7 +60,15 @@ class PetriNet::Graph < PetriNet::Base
     alias_method :add_object, :<<
 
     def get_node(id)
-        return @objects[id]
+        @objects[id]
+    end
+
+    def get_nodes
+        res = Array.new
+        @nodes.each_value do |n|
+            res << @objects[n]
+        end
+        res
     end
 
     def to_gv(output = 'png', filename = '')

data/lib/petri_net/graph/node.rb

@@ -20,7 +20,8 @@ class PetriNet::Graph::Node < PetriNet::Base
     # True if this is the start-marking
     attr_reader :start
 
-    def initialize(options = {}, &block)
+    def initialize(graph, options = {}, &block)
+        @graph = graph
         @id = next_object_id
         @name = (options[:name] or "Node#{@id}")
         @description = (options[:description] or "Node #{@id}")
@@ -72,6 +73,19 @@ class PetriNet::Graph::Node < PetriNet::Base
         ret
     end
 
+    def include_place(place)
+        places = @graph.net.get_place_list
+        included_places = Array.new
+        i = 0
+        @markings.each do |m|
+            if m > 0
+                included_places << places[i]
+            end
+            i += 1
+        end
+        included_places.include? place
+    end
+
     def validate
         true
     end

data/lib/petri_net/net.rb

@@ -247,7 +247,7 @@ Arcs
     def generate_coverability_graph()
         startmarkings = get_markings
         @graph = PetriNet::CoverabilityGraph.new(self)
-        @graph.add_node current_node = PetriNet::CoverabilityGraph::Node.new(markings: get_markings, start: true)
+        @graph.add_node current_node = PetriNet::CoverabilityGraph::Node.new(@graph, markings: get_markings, start: true)
 
         coverability_helper startmarkings, current_node
 
@@ -258,7 +258,7 @@ Arcs
     def generate_reachability_graph()
         startmarkings = get_markings
         @graph = PetriNet::ReachabilityGraph.new(self)
-        @graph.add_node current_node = PetriNet::ReachabilityGraph::Node.new(markings: get_markings, start: true)
+        @graph.add_node current_node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: get_markings, start: true)
 
         reachability_helper startmarkings, current_node
 
@@ -309,6 +309,11 @@ Arcs
         changed_state
     end
 
+    def get_place_list
+        @places.map{|key,pid| @objects[pid]}
+    end
+
+
     def objects_size
         @objects.count{|o| !o.nil?}
     end
@@ -357,19 +362,19 @@ Arcs
             raise PetriNet::ReachabilityGraph::InfinityGraphError if @objects[tid].inputs.empty? && !@objects[tid].outputs.empty?
             next if @objects[tid].inputs.empty?
             if @objects[tid].fire
-                current_node = PetriNet::ReachabilityGraph::Node.new(markings: get_markings)
+                current_node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: get_markings)
                 begin
                     node_id = @graph.add_node current_node
                 rescue
                     @graph.add_node! current_node
-                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: current_node)
-                    infinity_node = PetriNet::ReachabilityGraph::InfinityNode.new
+                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: source, destination: current_node)
+                    infinity_node = PetriNet::ReachabilityGraph::InfinityNode.new(@graph)
                     @graph.add_node infinity_node 
-                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: current_node, destination: infinity_node)
+                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: current_node, destination: infinity_node)
                     next 
                 end
-                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: current_node)
-                reachability_helper get_markings, current_node unless node_id
+                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: source, destination: current_node)# if node_id
+                reachability_helper get_markings, current_node if node_id
             end
             set_markings markings
         end
@@ -378,9 +383,9 @@ Arcs
     def coverability_helper(markings, source, added_omega = false)
         @transitions.each_value do |tid|
             if @objects[tid].fire
-                current_node = PetriNet::ReachabilityGraph::Node.new(markings: get_markings)
+                current_node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: get_markings)
                 current_node_id = @graph.add_node current_node
-                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: current_node, probability: @objects[tid].probability, transition: @objects[tid].name) if (!(current_node_id < 0))
+                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: source, destination: current_node, probability: @objects[tid].probability, transition: @objects[tid].name) if (!(current_node_id < 0))
                 omega = false
                 if current_node_id != -Float::INFINITY && current_node_id < 0 && @graph.get_node(current_node_id * -1) != current_node
                     omega = true
@@ -389,7 +394,7 @@ Arcs
                     if added_omega_old == added_omega
                         break
                     end
-                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: @graph.get_node(current_node_id * -1), probability: @objects[tid].probability, transition: @objects[tid].name)
+                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: source, destination: @graph.get_node(current_node_id * -1), probability: @objects[tid].probability, transition: @objects[tid].name)
                 end
                 coverability_helper get_markings, @graph.get_node(current_node_id.abs), added_omega if ((!(current_node_id < 0) || !omega) && current_node_id != -Float::INFINITY )
             end

data/lib/petri_net/reachability_graph/edge.rb

@@ -1,7 +1,7 @@
 class PetriNet::ReachabilityGraph::Edge < PetriNet::Graph::Edge
     # Creates an edge for PetriNet::ReachabilityGraph
-    def initialize(options = {}, &block)
-        super(options)
+    def initialize(graph, options = {}, &block)
+        super(graph, options)
         yield self unless block.nil?
     end
 

data/lib/petri_net/reachability_graph/node.rb

@@ -1,13 +1,13 @@
 class PetriNet::ReachabilityGraph::Node < PetriNet::Graph::Node
-    def initialize(options = {}, &block)
-        super(options)
+    def initialize(graph, options = {}, &block)
+        super(graph, options)
         yield self unless block.nil?
     end
 
 end
 
 class PetriNet::ReachabilityGraph::InfinityNode < PetriNet::ReachabilityGraph::Node
-    def initialize()
-        super(markings: [Float::INFINITY])
+    def initialize(graph)
+        super(graph, markings: [Float::INFINITY])
     end
 end

data/lib/petri_net/version.rb

@@ -1,6 +1,6 @@
 module PetriNet
     # Current Version
-    VERSION = "0.7.9.1"
+    VERSION = "0.8.0"
     # 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

@@ -6,7 +6,8 @@ require "#{File.dirname(__FILE__)}/../../lib/petri_net"
 class TestReachabilityGraphNode < Test::Unit::TestCase
     def setup
         @net = PetriNet::Net.new(:name => 'Water', :description => 'Creation of water from base elements.')
-        @node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,4,0])
+        @graph = PetriNet::ReachabilityGraph.new(@net)
+        @node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [1,3,5,4,0])
     end
 
     def teardown
@@ -14,7 +15,7 @@ class TestReachabilityGraphNode < Test::Unit::TestCase
     end
 
     def test_create_node
-        node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,4,0])
+        node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [1,3,5,4,0])
         assert_not_nil node
         assert_equal "Node2", node.name
         assert_equal [], node.inputs
@@ -25,7 +26,7 @@ class TestReachabilityGraphNode < Test::Unit::TestCase
     end
 
     def test_omega_marking
-        node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,Float::INFINITY,0])
+        node = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [1,3,5,Float::INFINITY,0])
         assert node.omega_marked, "should be omega_marked as there is an omega marking"
     end
 
@@ -37,12 +38,12 @@ class TestReachabilityGraphNode < Test::Unit::TestCase
     end
 
     def test_compare
-        node1 = PetriNet::ReachabilityGraph::Node.new(markings: [0,1,0,0,1])
-        node2 = PetriNet::ReachabilityGraph::Node.new(markings: [0,1,0,0,1])
-        node3 = PetriNet::ReachabilityGraph::Node.new(markings: [0,0,1,0,1])
-        node4 = PetriNet::ReachabilityGraph::Node.new(markings: [0,2,0,0,1])
-        node5 = PetriNet::ReachabilityGraph::Node.new(markings: [1,1,0,0,1])
-        node6 = PetriNet::ReachabilityGraph::Node.new(markings: [1,1,0,0,0])
+        node1 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [0,1,0,0,1])
+        node2 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [0,1,0,0,1])
+        node3 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [0,0,1,0,1])
+        node4 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [0,2,0,0,1])
+        node5 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [1,1,0,0,1])
+        node6 = PetriNet::ReachabilityGraph::Node.new(@graph, markings: [1,1,0,0,0])
 
         assert node1 == node1
         assert node2 == node2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petri_net
 version: !ruby/object:Gem::Version
-  version: 0.7.9.1
+  version: 0.8.0
 platform: ruby
 authors:
 - cclausen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz