petri_net 0.7.2 → 0.7.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce9fbf19b7836a63649d8b2e2ff923d6b130952
-  data.tar.gz: 0f5a0486c67ede47a093743fe16a1da43b6a5900
+  metadata.gz: 424a324ddce6aa016935fbf72566df141a908ac0
+  data.tar.gz: f642d0f9451834d2d4ceb602c56ee2ade52e649c
 SHA512:
-  metadata.gz: 3355739df8da5232040bc7b46b156f4d72ceaff55baba294c55d103c0410a1614920a5ca5afd5b141b1798c8bd1840d4d4b0bc36b40900019c87a9d43ed1bd17
-  data.tar.gz: 5a0a766e885d3dde361311d982a1624284441558ff9d617a62aa026042fa630ac1a95b7c4c5d260f6ceb93d1c67e75f99c75b5b39b08e216019f7c9c8202834e
+  metadata.gz: 203e591a97198ae311563099b29305b0499f16024e57984a9152dff16fa929739e049a9ef00e6c0f0c58f61f67df3ff440e1e57960fc7d1026774fed0c8583df
+  data.tar.gz: 21a108f4151259a0e9bdefaa693e93b777524b13971b6fd8d61142c81f8c1e5956889458b2ff46c7196651e9f72fc2fbadd84c51690410bc833516d8f4ba08c9

data/lib/petri_net/arc.rb

@@ -33,7 +33,7 @@ module PetriNet
         # before the object is added to the arc and an exception will be raised.
         def add_source(object)
             if object.class.to_s == "String"
-                object = (net.get_place object or net.get_transition object)
+                object = (@net.get_place object or @net.get_transition object)
             end
             if validate_source_destination(object)
                 @source = object
@@ -46,7 +46,7 @@ module PetriNet
         # Add a destination object
         def add_destination(object)
             if object.class.to_s == "String"
-                object = (net.get_place object or net.get_transition object)
+                object = (@net.get_place object or @net.get_transition object)
             end
             if validate_source_destination(object)
                 @destination = object
@@ -117,6 +117,12 @@ module PetriNet
             @destination.id = net.objects_find_index @destination
         end
 
+        def <=>(object)
+            return false unless object.class.to_s == "PetriNet::Arc"
+            return false unless object.source == self.source && object.destination == self.destination
+            return object.weight <=> self.weight
+        end
+
         private
 
         # Validate source or destination object

data/lib/petri_net/coverability_graph/edge.rb

@@ -0,0 +1,13 @@
+class PetriNet::CoverabilityGraph::Edge < PetriNet::Base
+    
+    # Creates an edge for PetriNet::CoverabilityGraph
+    def initialize(options = {}, &block)
+        super(options)
+        yield self unless block.nil?
+    end
+
+    # Validates the data holded by this edge, this will be used while adding the edge to the graph
+    def validate
+        super
+    end
+end

data/lib/petri_net/coverability_graph/graph.rb

@@ -0,0 +1,54 @@
+require 'graphviz'
+
+class PetriNet::CoverabilityGraph < PetriNet::Base
+    def initialize(net, options = Hash.new)
+        @objects = Array.new
+        @nodes = Hash.new
+        @edges = Hash.new
+        @name = net.name
+        if options['unlimited'].nil? 
+            @unlimited = true 
+        else 
+            @unlimited = options['unlimited']
+        end
+    end
+
+    def add_node(node)
+        double = false
+        inf = false
+        @nodes.each_value do |n|
+            begin
+                if node > @objects[n]
+                    if @unlimited
+                        double = n
+                        break
+                        #return @objects[n].id *-1
+                    else
+                        raise PetriNet::Graph::InfiniteReachabilityGraphError
+                    end
+                end
+                if -Float::INFINITY == (node <=> @objects[n])
+                    inf = true
+                end
+            rescue ArgumentError
+                #just two different markings, completly ok
+            end
+        end
+        # if there was a smaller marking
+        return (@objects[double].id * -1) if double
+        node_index = @objects.index node
+        # if there already is a node with this marking
+        return @objects[node_index].id * -1 unless node_index.nil?
+
+        return -Float::INFINITY if inf
+
+        if (node.validate && (!@nodes.include? node.name))
+            @objects[node.id] = node
+            @nodes[node.name] = node.id
+            node.graph = self
+            return node.id
+        end
+        return false
+    end
+
+end

data/lib/petri_net/coverability_graph/node.rb

@@ -0,0 +1,127 @@
+class PetriNet::CoverabilityGraph::Node < PetriNet::Base
+    include Comparable
+
+    # human readable name
+    attr_reader :name
+    # unique ID
+    attr_reader :id 
+    # Makking this node represents
+    attr_reader :markings
+    # The graph this node belongs to
+    attr_accessor :graph
+    # Omega-marked node (unlimited Petrinet -> coverabilitygraph)
+    attr_reader :omega_marked
+    # Incoming edges
+    attr_reader :inputs
+    # Outgoing edges
+    attr_reader :outputs
+    # Label of the node
+    attr_reader :label
+    # True if this is the start-marking
+    attr_reader :start
+
+    def initialize(options = {}, &block)
+        @id = next_object_id
+        @name = (options[:name] or "Node#{@id}")
+        @description = (options[:description] or "Node #{@id}")
+        @inputs = Array.new
+        @outputs = Array.new
+        @label = (options[:label] or @name)
+        @markings = options[:markings] 
+        @start = (options[:start] or false)
+        if @markings.nil?
+            raise ArgumentError.new "Every Node needs markings"
+        end
+        if @markings.include? Float::INFINITY
+            @omega_marked = true 
+        else 
+            @omega_marked = false
+        end
+
+        yield self unless block.nil?
+    end
+
+    # Add an omega-marking to a specified place
+    def add_omega object 
+        ret = Array.new
+        if object.class.to_s == "PetriNet::CoverabilityGraph::Node"
+            if self < object
+                counter = 0
+                object.markings.each do |marking|
+                    if @markings[counter] < marking 
+                        @markings[counter] = Float::INFINITY 
+                        ret << counter
+                    end
+                    counter += 1
+                end
+            else
+                return false
+            end
+        elsif object.class.to_s == "Array"
+            object.each do |place|
+                markings[place] = Float::INFINITY
+                ret = object
+            end
+        elsif object.class.to_s == "Fixnum"
+            markings[object] = Float::INFINITY
+            ret = [object]
+        end
+        @omega_marked = true
+        ret
+    end
+
+    def validate
+        true
+    end
+
+    def gv_id
+        "N#{@id}"
+    end
+
+    def to_gv
+        "\t#{self.gv_id} [ label = \"#{@markings}\" ];\n"
+    end
+
+    # Compare-operator, other Operators are available through comparable-mixin
+    def <=>(object)
+        return nil unless object.class.to_s == "PetriNet::CoverabilityGraph::Node"
+        if @markings == object.markings
+            return 0
+        end
+
+        counter = 0
+        less = true
+        self.markings.each do |marking|
+            if marking <= object.markings[counter] && less
+                less = true
+            else 
+                less = false
+                break
+            end
+            counter += 1
+        end
+        if less
+            return -1 
+        end
+        counter = 0
+        more = true
+        self.markings.each do |marking|
+            if marking >= object.markings[counter] && more
+                more = true
+            else
+                more = false
+                break
+            end
+            counter += 1
+        end
+        if more
+            return 1
+        end
+        return nil
+    end
+
+    def to_s
+        "#{@id}: #{@name} (#{@markings})"
+    end
+
+end

data/lib/petri_net/coverability_graph.rb

@@ -0,0 +1,6 @@
+require_relative 'graph'
+require_relative 'coverability_graph/graph'
+require_relative 'coverability_graph/node'
+require_relative 'coverability_graph/edge'
+#class PetriNet::CoverabilityGraph < PetriNet::Base
+#end

data/lib/petri_net/graph/edge.rb

@@ -0,0 +1,57 @@
+class PetriNet::Graph::Edge < PetriNet::Base
+    # Human readable name
+    attr_reader :name
+    # Unique ID
+    attr_reader :id
+    # Graph this edge belongs to
+    attr_accessor :graph
+    # Probability of the relating transition
+    attr_accessor :probability
+    # Source of the edge
+    attr_reader :source
+    # Destination of the edge
+    attr_reader :destination
+    # Transition this edge is representing
+    attr_reader :transition
+    
+    # Creates an edge for PetriNet::Graph
+    def initialize(options = {}, &block)
+        @id = next_object_id
+        @name = (options[:name] or "Edge#{@id}")
+        @description = (options[:description] or "Edge #{@id}")
+        @source = options[:source] 
+        @destination = options[:destination]
+        @label = (options[:label] or @name)
+        @probability = options[:probability]
+        @transition = (options[:transition] or "")
+
+        yield self unless block.nil?
+    end
+
+    # Validates the data holded by this edge, this will be used while adding the edge to the graph
+    def validate
+        true
+    end
+
+    def to_gv
+        "\t#{@source.gv_id} -> #{@destination.gv_id}#{probability_to_gv};\n"
+    end
+
+    def ==(object)
+        return false unless object.class.to_s == "PetriNet::ReachabilityGraph::Edge"
+        (@source == object.yource && @destination == oject.destination)
+    end
+    def to_s
+        "#{@id}: #{@name} #{@source.id} -> #{@destination} )"
+    end
+
+    private
+    def probability_to_gv
+        if @probability 
+            " [ label = \"#{@probability.to_s}\" ] "
+        else
+            ''
+        end
+    end
+
+end

data/lib/petri_net/graph/graph.rb

@@ -0,0 +1,108 @@
+require 'graphviz'
+
+class PetriNet::InfiniteReachabilityGraphError < RuntimeError
+end
+
+class PetriNet::Graph < PetriNet::Base
+    def initialize(net, options = Hash.new)
+        @objects = Array.new
+        @nodes = Hash.new
+        @edges = Hash.new
+        @name = net.name
+        @type = "Reachability"
+        if options['unlimited'].nil? 
+            @unlimited = true 
+        else 
+            @unlimited = options['unlimited']
+        end
+    end
+
+    def add_node(node)
+        if node.validate && (!@objects.include? node)
+            @objects[node.id] = node
+            @nodes[node.name] = node.id
+            node.graph = self
+            return node.id
+        end
+        return false
+    end
+    alias_method :add_node!, :add_node
+
+    def add_edge(edge)
+        if (edge.validate && (!@edges.include? edge.name))
+            @objects[edge.id] = edge
+            @edges[edge.name] = edge.id
+            edge.graph = self
+            return edge.id
+        end
+        return false
+    end
+
+    # Add an object to the Petri Net.
+    def <<(object)
+        case object.class.to_s
+        when "Array"
+            object.each {|o| self << o}
+        when "PetriNet::ReachabilityGraph::Edge"
+            add_edge(object)
+        when "PetriNet::ReachabilityGraph::Node"
+            add_node(object)
+        else
+            raise "(PetriNet::ReachabilityGraph) Unknown object #{object.class}."
+        end
+        self
+    end
+    alias_method :add_object, :<<
+
+    def get_node(id)
+        return @objects[id]
+    end
+
+    def to_gv(output = 'png', filename = '')
+        g = generate_gv
+        if filename.empty?
+            filename = "#{@name}_graph.png"
+        end
+        g.output( :png => filename ) if output == 'png'
+        g.output
+    end
+
+    def generate_gv
+        g = GraphViz.new( :G, :type => :digraph )
+
+        @nodes.each_value do |node|
+            gv_node = g.add_nodes( @objects[node].markings.to_s )
+            gv_node.set do |n|
+                n.label = '*' + @objects[node].markings.to_s + '*' if @objects[node].start 
+            end
+        end
+        @edges.each_value do |edge|
+            gv_edge = g.add_edges( @objects[edge].source.markings.to_s, @objects[edge].destination.markings.to_s )
+            gv_edge.set do |e|
+                e.label = @objects[edge].transition
+            end
+        end
+        g
+    end
+
+    def to_s
+        str = "#{@type} Graph [#{@name}]\n"
+        str += "----------------------------\n"
+        str += "Description: #{@description}\n"
+        str += "Filename: #{@filename}\n"
+        str += "\n"
+
+        str += "Nodes\n"
+        str += "----------------------------\n"
+        @nodes.each_value {|p| str += @objects[p].to_s + "\n" }
+        str += "\n"
+
+        str += "Edges\n"
+        str += "----------------------------\n"
+        @edges.each_value {|t| str += @objects[t].to_s + "\n" }
+        str += "\n"
+
+        return str
+    end
+
+end

data/lib/petri_net/graph/node.rb

@@ -0,0 +1,129 @@
+class PetriNet::Graph::Node < PetriNet::Base
+    include Comparable
+
+    # human readable name
+    attr_reader :name
+    # unique ID
+    attr_reader :id 
+    # Makking this node represents
+    attr_reader :markings
+    # The graph this node belongs to
+    attr_accessor :graph
+    # Omega-marked node (unlimited Petrinet -> coverabilitygraph)
+    attr_reader :omega_marked
+    # Incoming edges
+    attr_reader :inputs
+    # Outgoing edges
+    attr_reader :outputs
+    # Label of the node
+    attr_reader :label
+    # True if this is the start-marking
+    attr_reader :start
+
+    def initialize(options = {}, &block)
+        @id = next_object_id
+        @name = (options[:name] or "Node#{@id}")
+        @description = (options[:description] or "Node #{@id}")
+        @inputs = Array.new
+        @outputs = Array.new
+        @label = (options[:label] or @name)
+        @markings = options[:markings] 
+        @start = (options[:start] or false)
+        if @markings.nil?
+            raise ArgumentError.new "Every Node needs markings"
+        end
+        if @markings.include? Float::INFINITY
+            @omega_marked = true 
+        else 
+            @omega_marked = false
+        end
+
+        yield self unless block.nil?
+    end
+
+    # Add an omega-marking to a specified place
+    def add_omega object 
+        ret = Array.new
+        if object.class.to_s == "PetriNet::CoverabilityGraph::Node"
+            if self < object
+                counter = 0
+                object.markings.each do |marking|
+                    if @markings[counter] < marking 
+                        @markings[counter] = Float::INFINITY 
+                        ret << counter
+                    end
+                    counter += 1
+                end
+            else
+                return false
+            end
+        elsif object.class.to_s == "Array"
+            object.each do |place|
+                markings[place] = Float::INFINITY
+                ret = object
+            end
+        elsif object.class.to_s == "Fixnum"
+            markings[object] = Float::INFINITY
+            ret = [object]
+        elsif object.class.to_s == "PetriNet::ReachabilityGraph::Node"
+            raise PetriNet::Graph::InfinityError("ReachabilityGraphs do not support omega-markings")
+        end
+        @omega_marked = true
+        ret
+    end
+
+    def validate
+        true
+    end
+
+    def gv_id
+        "N#{@id}"
+    end
+
+    def to_gv
+        "\t#{self.gv_id} [ label = \"#{@markings}\" ];\n"
+    end
+
+    # Compare-operator, other Operators are available through comparable-mixin
+    def <=>(object)
+        return nil unless object.class.to_s == "PetriNet::ReachabilityGraph::Node"
+        if @markings == object.markings
+            return 0
+        end
+
+        counter = 0
+        less = true
+        self.markings.each do |marking|
+            if marking <= object.markings[counter] && less
+                less = true
+            else 
+                less = false
+                break
+            end
+            counter += 1
+        end
+        if less
+            return -1 
+        end
+        counter = 0
+        more = true
+        self.markings.each do |marking|
+            if marking >= object.markings[counter] && more
+                more = true
+            else
+                more = false
+                break
+            end
+            counter += 1
+        end
+        if more
+            return 1
+        end
+        return nil
+    end
+
+    def to_s
+        "#{@id}: #{@name} (#{@markings})"
+    end
+
+end

data/lib/petri_net/graph.rb

@@ -0,0 +1,5 @@
+require_relative 'graph/graph'
+require_relative 'graph/node'
+require_relative 'graph/edge'
+class PetriNet::Graph < PetriNet::Base
+end

data/lib/petri_net/net.rb

@@ -17,8 +17,8 @@ class PetriNet::Net < PetriNet::Base
     # !depricated!
     attr_reader   :markings
 
-# should not be public available    attr_reader   :objects       # Array of all objects in net
-#    attr_reader   :up_to_date    # is true if, and only if, the cached elements are calculated AND the net hasn't changed
+    # should not be public available    attr_reader   :objects       # Array of all objects in net
+    #    attr_reader   :up_to_date    # is true if, and only if, the cached elements are calculated AND the net hasn't changed
 
 
     # Create new Petri Net definition.
@@ -173,6 +173,32 @@ Arcs
         return str
     end
 
+    def to_gv_new(output = 'png', filename = '')
+        g = generate_gv
+        if filename.empty?
+            filename = "#{@name}_net.png"
+        end
+        g.output( :png => filename ) if output == 'png'
+        g.output
+    end
+
+    def generate_gv
+        g = GraphViz.new( :G, :type => :digraph )
+
+        @places.each_value do |place|
+            gv_node = g.add_nodes( @objects[place].name )
+        end
+        @transitions.each_value do |transition|
+            gv_node = g.add_nodes( @objects[transition].name)
+            gv_node.shape = :box
+            gv_node.fillcolor = :grey90
+        end
+        @arcs.each_value do |arc|
+            gv_edge = g.add_edges( @objects[arc].source.name, @objects[arc].destination.name )
+        end
+        g
+    end
+
     # Generate GraphViz dot string.
     def to_gv
         # General graph options
@@ -201,6 +227,7 @@ Arcs
         return str
     end
 
+
     # Merges two PetriNets
     # Places, transitions and arcs are equal if they have the same name and description, arcs need to have the same source and destination too). With this definition of equality the resultung net will have unique ojects.
     # ATTENTION conflicting capabilities and weights will be lost and the properies of the net you merge to will be used in future
@@ -212,17 +239,33 @@ Arcs
         self
     end
 
-    def generate_reachability_graph(unlimited = true)
-        raise "Not implemented yet" unless unlimited
+    def reachability_graph
+        generate_reachability_graph unless (@graph && @up_to_date)
+        @graph
+    end
+
+    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)
+
+        coverability_helper startmarkings, current_node
+
+        set_markings startmarkings
+        @graph 
+    end
+
+    def generate_reachability_graph()
         startmarkings = get_markings
         @graph = PetriNet::ReachabilityGraph.new(self)
-        @graph.add_node current_node = PetriNet::ReachabilityGraph::Node.new(markings: get_markings)
+        @graph.add_node current_node = PetriNet::ReachabilityGraph::Node.new(markings: get_markings, start: true)
 
         reachability_helper startmarkings, current_node
 
         set_markings startmarkings
         @graph 
     end
+
     def generate_weight_function
         @weight = Hash.new
         @arcs.each_value do |id|
@@ -242,7 +285,7 @@ Arcs
         generate_weight_function
         @up_to_date = true
     end
-    
+
     # is true if, and only if, the cached elements are calculated AND the net hasn't changed
     def update?
         if @w_up_to_date && true #all up_to_date-caches!!!
@@ -310,15 +353,45 @@ Arcs
     end
 
     def reachability_helper(markings, source)
+        @transitions.each_value do |tid|
+            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)
+                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_node infinity_node 
+                    @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(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
+            end
+            set_markings markings
+        end
+    end
+
+    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_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.get_node(current_node_id * -1).add_omega current_node
+                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))
+                omega = false
+                if current_node_id != -Float::INFINITY && current_node_id < 0 && @graph.get_node(current_node_id * -1) != current_node
+                    omega = true
+                    added_omega_old = added_omega
+                    added_omega = @graph.get_node(current_node_id * -1).add_omega current_node
+                    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)
                 end
-                reachability_helper get_markings, current_node unless (current_node_id < 0)
+                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
             set_markings markings
         end