petri_net 0.8.0 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6280711333c42af2d42f9f72dc8d7e9addf491d0
-  data.tar.gz: 0f5c88804ad2453ac2ac5f58ed48b402e6a46332
+  metadata.gz: 785d6ed616e72a8f4229c584b3625bd182dcc354
+  data.tar.gz: 7ae508f907786e328f3148ab86c5653bdc6e03c2
 SHA512:
-  metadata.gz: d11cb20273590228cc3324d6e5483eb6f6d79fb2cf8e3217200fb86e4464d511126eb2c9a2843c11ec8f69a54ff061d63f3c4037fd9b7c637dabe749eda05d4c
-  data.tar.gz: 4bf91f1daf2975b146139be896386cc1704d393f33d3d4936afc4e7e607b97ad214d09c674dd6c189c3b51b5a25a323308a78a8201bcc7e3ba5ad249c530f0b1
+  metadata.gz: 71ec4878553ee6f33000bf9901d2ba1b9707ad3ddb0e793812ec19bbc027ce2ea1a77ee2669f1f625210f82f13744ecd304614379c2348d76fa33288d4600ff0
+  data.tar.gz: 2eba62b83d60d28a62d14a67d07bb1981a2026a3f693b959f264bd7bd0c9e7f24fe6f556a7415c4db82edb9fd675aff38b8e5d28dee7a8e5634445d8691b4afa

data/.travis.yml

@@ -5,7 +5,8 @@ rvm:
 - 2.0.0
 
 before_install:
-    gem install net-sftp
+    - gem install net-sftp
+    - sudo apt-get install graphviz
 
 script: 
-    rake test
+    - rake test

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in petri.gemspec
 gemspec
+
+#gem 'rgl', "~>0.4.1"
+gem 'rgl', :git => 'https://github.com/monora/rgl.git'

data/lib/petri_net/graph/edge.rb

@@ -31,6 +31,7 @@ class PetriNet::Graph::Edge < PetriNet::Base
 
     # Validates the data holded by this edge, this will be used while adding the edge to the graph
     def validate
+        return false unless ( @graph.nodes.has_key? @source.name and @graph.nodes.has_key? @destination.name )
         true
     end
 
@@ -43,7 +44,7 @@ class PetriNet::Graph::Edge < PetriNet::Base
         (@source == object.yource && @destination == oject.destination)
     end
     def to_s
-        "#{@id}: #{@name} #{@source.id} -> #{@destination} )"
+        "#{@id}: #{@name} #{@source} -> #{@destination} )"
     end
 
     private

data/lib/petri_net/graph/graph.rb

@@ -1,5 +1,7 @@
 require 'graphviz'
-
+require 'graphviz/theory'
+require 'rgl/adjacency'
+require 'rgl/dijkstra'
 class PetriNet::InfiniteReachabilityGraphError < RuntimeError
 end
 
@@ -7,6 +9,10 @@ class PetriNet::Graph < PetriNet::Base
 
     # The PetriNet this graph belongs to
     attr_reader :net
+    # all nodes from this graph
+    attr_reader :nodes
+    # all edges of this graph
+    attr_reader :edges
 
     def initialize(net, options = Hash.new)
         @net = net
@@ -29,6 +35,10 @@ class PetriNet::Graph < PetriNet::Base
             node.graph = self
             return node.id
         end
+        if @objects.include? node
+            res = (@objects.index node) * -1
+            return res 
+        end
         return false
     end
     alias_method :add_node!, :add_node
@@ -38,12 +48,24 @@ class PetriNet::Graph < PetriNet::Base
             @objects[edge.id] = edge
             @edges[edge.name] = edge.id
             edge.graph = self
+            edge.source.outputs << edge.id
+            edge.destination.inputs << edge.id
             return edge.id
         end
         return false
     end
 
-    # Add an object to the Petri Net.
+    def get_edge(source, dest)
+        res = nil
+        @edges.each_value do |edge|
+            if @objects[edge].source == source && @objects[edge].destination == dest
+                res = @objects[edge]
+            end
+        end
+        res
+    end
+
+    # Add an object to the Graph.
     def <<(object)
         case object.class.to_s
         when "Array"
@@ -59,7 +81,16 @@ class PetriNet::Graph < PetriNet::Base
     end
     alias_method :add_object, :<<
 
-    def get_node(id)
+    def get_node(node)
+        if node.class.to_s == "Fixnum"
+            return @objects[node]
+        end
+        if node.class.to_s == "Array"
+            return @objects.select{|o| o.class.to_s == "PetriNet::ReachabilityGraph::Node" && o.markings == node}.first
+        end
+    end
+
+    def get_object(id)
         @objects[id]
     end
 
@@ -71,6 +102,13 @@ class PetriNet::Graph < PetriNet::Base
         res
     end
 
+    def infinite?
+        @nodes.each_value do |node|
+            return true if @objects[node].infinite?
+        end
+        false
+    end
+
     def to_gv(output = 'png', filename = '')
         g = generate_gv
         if filename.empty?
@@ -95,7 +133,18 @@ class PetriNet::Graph < PetriNet::Base
                 e.label = @objects[edge].transition
             end
         end
-        g
+        @gv = g
+    end
+
+    def generate_rgl
+        g = RGL::DirectedAdjacencyGraph.new 
+        @nodes.each_value do |node|
+            g.add_vertex @objects[node].markings.to_s
+        end
+        @edges.each_value do |edge|
+            g.add_edge @objects[edge].source.markings.to_s, @objects[edge].destination.markings.to_s
+        end
+        @rgl = g
     end
 
     def to_s
@@ -118,4 +167,103 @@ class PetriNet::Graph < PetriNet::Base
         return str
     end
 
+    def get_rgl
+        if @rgl.nil?
+            generate_rgl
+        end
+        @rgl
+    end
+
+    def cycles
+        get_rgl.cycles
+    end
+
+    def shortest_path(start, destination)
+        g = get_rgl
+        weights = lambda { |edge| 1 }
+        g.dijkstra_shortest_path(weights, start.to_s, destination.to_s)
+    end
+
+
+    def path_probability(path)
+        sanitize_probabilities
+        prob = 1
+        counter = 0
+        path.each do |node|
+            edge = get_edge(path[counter+1], node)
+            prob = prob * edge.probability unless edge.nil? # last node has no pre-edge
+            counter = counter += 1
+        end
+        prob
+    end
+
+    def node_probability(start, node)
+        paths = get_paths_without_loops(start, node)
+        prob = 0
+        paths.each do |path|
+            prob = prob + (path_probability path)
+        end
+        prob
+    end
+
+    def best_path(start, node)
+        paths = get_paths_without_loops(start, node)
+        prob = 0
+        res_path = nil
+        paths.each do |path|
+            if (path_probability path) >= prob
+                prob = (path_probability path)
+                res_path = path
+            end
+        end
+        [res_path,prob]
+    end
+
+    def worst_path(start, node)
+        paths = get_paths_without_loops(start, node)
+        prob = 1
+        res_path = nil
+        paths.each do |path|
+            if (path_probability path) <= prob
+                prob = (path_probability path)
+                res_path = path
+            end
+        end
+        [res_path,prob]
+    end
+
+    def get_paths_without_loops(start, goal)
+        get_paths_without_loops_helper(get_node(start), get_node(goal)) 
+    end
+
+    def sanitize_probabilities
+        @nodes.each_value do |node|
+            prob = 1.0
+            @objects[node].outputs.each do |edge|
+                prob = prob + @objects[edge].probability unless @objects[edge].probability.nil?
+            end
+            @objects[node].outputs.each do |edge|
+                @objects[edge].probability = prob/@objects[node].outputs.size if @objects[edge].probability.nil?
+            end
+        end
+    end
+
+
+private
+    def get_paths_without_loops_helper(start, goal, reverse_paths = Array.new, reverse_path = Array.new)
+        if goal == start
+            reverse_path << goal
+            reverse_paths << reverse_path
+            return nil 
+        end
+        if reverse_path.include? goal
+            return nil
+        end
+        path = Array.new
+        goal.inputs.each do |input|
+            get_paths_without_loops_helper(start, @objects[input].source, reverse_paths, reverse_path.clone << goal)
+        end
+        reverse_paths 
+    end
+
 end

data/lib/petri_net/graph/node.rb

@@ -42,6 +42,10 @@ class PetriNet::Graph::Node < PetriNet::Base
         yield self unless block.nil?
     end
 
+    def infinite?
+        @omega_marked
+    end
+
     # Add an omega-marking to a specified place
     def add_omega object 
         ret = Array.new

data/lib/petri_net/net.rb

@@ -1,6 +1,10 @@
 require 'yaml'
+require 'graphviz'
+require 'matrix'
+require 'bigdecimal/ludcmp'
 
 class PetriNet::Net < PetriNet::Base
+    include LUSolve
     # Human readable name
     attr_accessor :name
     # Storage filename
@@ -240,6 +244,9 @@ Arcs
     end
 
     def reachability_graph
+        if !@up_to_date
+            update
+        end
         generate_reachability_graph unless (@graph && @up_to_date)
         @graph
     end
@@ -300,6 +307,18 @@ Arcs
         @places.map{|key,pid| @objects[pid].markings.size}
     end
 
+    def get_marking(places)
+        unless places.class.to_s == "Array"
+            places = [places]
+        end
+        if places.first.class.to_s == "Fixnum"
+            places.map!{|p| get_place p}
+        end
+        res = Array.new
+        get_place_list.map{|place| if places.include? place.name then res << 1 else res << 0 end}
+        res
+    end
+
     def set_markings(markings)
         i = 0
         @places.each_value do |pid| 
@@ -313,6 +332,11 @@ Arcs
         @places.map{|key,pid| @objects[pid]}
     end
 
+    def get_place_from_marking(marking)
+        return marking if marking.count(1) != 1
+        get_place_list[marking.index(1)].name
+    end
+
 
     def objects_size
         @objects.count{|o| !o.nil?}
@@ -346,8 +370,46 @@ Arcs
         get_transition(transition).fire
     end
 
+    def delta
+        if @delta.nil?
+            generate_delta
+        end
+        @delta
+    end
+
+    def t_invariants
+        delta = self.delta
+        zero_vector = Array.new
+        delta.row_count.times { zero_vector << 0 }
+        zero = BigDecimal("0.0")
+        one  = BigDecimal("1.0")
+
+        ps = ludecomp(delta.t.to_a.flatten.map{|i|BigDecimal(i,16)},delta.row_count, zero, one)
+        x = lusolve(delta.t.to_a.flatten.map{|i|BigDecimal(i,16)},zero_vector.map{|i|BigDecimal(i,16)},ps, zero)
+
+        x
+    end
+
+    def s_invariant
+        raise "Not jet implemented"
+    end
+
     private
 
+    def generate_delta
+        d = Array.new(@places.size){Array.new(@transitions.size)}
+        i = 0
+        @places.each do |p_key,p_value|
+            j = 0
+            @transitions.each do |t_key,t_value|
+                d[i][j] = w0(t_value, p_value) - w0(p_value,t_value)
+                j += 1
+            end
+            i += 1
+        end
+        @delta = Matrix[d]
+    end
+
     def changed_structure
         @w_up_to_date = false
         @up_to_date = false
@@ -356,7 +418,6 @@ Arcs
     def changed_state
         @up_to_date = false
     end
-
     def reachability_helper(markings, source)
         @transitions.each_value do |tid|
             raise PetriNet::ReachabilityGraph::InfinityGraphError if @objects[tid].inputs.empty? && !@objects[tid].outputs.empty?
@@ -373,8 +434,11 @@ Arcs
                     @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: current_node, destination: infinity_node)
                     next 
                 end
-                @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
+                if node_id < 0
+                    current_node = @graph.get_node node_id.abs
+                end
+                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(@graph, source: source, destination: current_node, probability: @objects[tid].probability)# if node_id
+                reachability_helper get_markings, current_node if node_id >= 0
             end
             set_markings markings
         end

data/lib/petri_net/version.rb

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

data/petri_net.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   
   gem.license       = 'MIT'
   gem.add_dependency "ruby-graphviz"
-  gem.add_dependency "graphviz"
+#  gem.add_dependency "rgl"
   gem.add_development_dependency "net-sftp"
 end

data/test/reachability_graph/tc_graph.rb

@@ -71,7 +71,7 @@ Edges
         @net << PetriNet::Arc.new(source:@net.get_transition('T'), destination:@net.get_place('B'))
         @net.get_place('A').add_marking
         rn = @net.generate_reachability_graph
-        assert_equal "Reachability Graph [SimpleNet1]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n6: Node6 ([1, 0])\n7: Node7 ([0, 1])\n\nEdges\n----------------------------\n8: Edge8 6 -> 7: Node7 ([0, 1]) )\n\n", rn.to_s
+        assert_equal "Reachability Graph [SimpleNet1]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n6: Node6 ([1, 0])\n7: Node7 ([0, 1])\n\nEdges\n----------------------------\n8: Edge8 6: Node6 ([1, 0]) -> 7: Node7 ([0, 1]) )\n\n", rn.to_s
 
     end
 
@@ -88,7 +88,7 @@ Edges
         @net << PetriNet::Arc.new(source:@net.get_transition('T2'), destination:@net.get_place('C'))
         @net.get_place('A').add_marking
         rn = @net.generate_reachability_graph
-        assert_equal "Reachability Graph [SimpleNet2]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n10: Node10 ([1, 0, 0])\n11: Node11 ([0, 1, 0])\n13: Node13 ([0, 0, 1])\n\nEdges\n----------------------------\n12: Edge12 10 -> 11: Node11 ([0, 1, 0]) )\n14: Edge14 10 -> 13: Node13 ([0, 0, 1]) )\n\n", rn.to_s
+        assert_equal "Reachability Graph [SimpleNet2]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n10: Node10 ([1, 0, 0])\n11: Node11 ([0, 1, 0])\n13: Node13 ([0, 0, 1])\n\nEdges\n----------------------------\n12: Edge12 10: Node10 ([1, 0, 0]) -> 11: Node11 ([0, 1, 0]) )\n14: Edge14 10: Node10 ([1, 0, 0]) -> 13: Node13 ([0, 0, 1]) )\n\n", rn.to_s
 
     end
 
@@ -102,7 +102,7 @@ Edges
         @net << PetriNet::Arc.new(source:@net.get_transition('T'), destination:@net.get_place('A'))
         @net.get_place('A').add_marking
         rn = @net.generate_reachability_graph
-        assert_equal "Reachability Graph [SimpleNet3]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n7: Node7 ([1, 0])\n8: Node8 ([1, 1])\n10: Node10 ([Infinity])\n\nEdges\n----------------------------\n9: Edge9 7 -> 8: Node8 ([1, 1]) )\n11: Edge11 8 -> 10: Node10 ([Infinity]) )\n\n", rn.to_s
+        assert_equal "Reachability Graph [SimpleNet3]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n7: Node7 ([1, 0])\n8: Node8 ([1, 1])\n10: Node10 ([Infinity])\n\nEdges\n----------------------------\n9: Edge9 7: Node7 ([1, 0]) -> 8: Node8 ([1, 1]) )\n11: Edge11 8: Node8 ([1, 1]) -> 10: Node10 ([Infinity]) )\n\n", rn.to_s
 
     end
 
@@ -119,7 +119,7 @@ Edges
         @net << PetriNet::Arc.new(source:@net.get_transition('T2'), destination:@net.get_place('A'))
         @net.get_place('A').add_marking
         rn = @net.generate_reachability_graph
-        assert_equal "Reachability Graph [SimpleNet4]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n10: Node10 ([1, 0])\n11: Node11 ([1, 1])\n13: Node13 ([Infinity])\n15: Node15 ([2, 0])\n17: Node17 ([Infinity])\n\nEdges\n----------------------------\n12: Edge12 10 -> 11: Node11 ([1, 1]) )\n14: Edge14 11 -> 13: Node13 ([Infinity]) )\n16: Edge16 10 -> 15: Node15 ([2, 0]) )\n18: Edge18 15 -> 17: Node17 ([Infinity]) )\n\n", rn.to_s
+        assert_equal "Reachability Graph [SimpleNet4]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n10: Node10 ([1, 0])\n11: Node11 ([1, 1])\n13: Node13 ([Infinity])\n15: Node15 ([2, 0])\n17: Node17 ([Infinity])\n\nEdges\n----------------------------\n12: Edge12 10: Node10 ([1, 0]) -> 11: Node11 ([1, 1]) )\n14: Edge14 11: Node11 ([1, 1]) -> 13: Node13 ([Infinity]) )\n16: Edge16 10: Node10 ([1, 0]) -> 15: Node15 ([2, 0]) )\n18: Edge18 15: Node15 ([2, 0]) -> 17: Node17 ([Infinity]) )\n\n", rn.to_s
 
     end
 
@@ -136,7 +136,7 @@ Edges
         @net.get_place('A').add_marking
         @net.to_gv_new
         rn = @net.generate_reachability_graph
-        assert_equal "Reachability Graph [SimpleNet5]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n9: Node9 ([1, 0])\n10: Node10 ([0, 1])\n\nEdges\n----------------------------\n11: Edge11 9 -> 10: Node10 ([0, 1]) )\n\n", rn.to_s
+        assert_equal "Reachability Graph [SimpleNet5]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n9: Node9 ([1, 0])\n10: Node10 ([0, 1])\n\nEdges\n----------------------------\n11: Edge11 9: Node9 ([1, 0]) -> 10: Node10 ([0, 1]) )\n13: Edge13 10: Node10 ([0, 1]) -> 9: Node9 ([1, 0]) )\n\n", rn.to_s
 
         rn.to_gv
     end
@@ -182,4 +182,21 @@ Edges
         @net << PetriNet::Transition.new(name:'T1')
         @net.generate_reachability_graph # Don't know what to test here, bit this crashed with an Error before...
     end
+
+    def test_looped_net1
+        @net = PetriNet::Net.new(:name => 'LoopedNet1', :description => 'Should be looped')
+        @net << PetriNet::Place.new(name: 'A')
+        @net << PetriNet::Place.new(name: 'B')
+        @net << PetriNet::Transition.new(name:'T1')
+        @net << PetriNet::Transition.new(name:'T2')
+        @net << PetriNet::Arc.new(source:@net.get_place('A'), destination:@net.get_transition('T1'))
+        @net << PetriNet::Arc.new(source:@net.get_place('B'), destination:@net.get_transition('T2'))
+        @net << PetriNet::Arc.new(source:@net.get_transition('T1'), destination:@net.get_place('B'))
+        @net << PetriNet::Arc.new(source:@net.get_transition('T2'), destination:@net.get_place('A'))
+        @net.get_place('A').add_marking
+        @net.to_gv_new
+        rg = @net.generate_reachability_graph 
+        rg.to_gv
+        assert_equal "Reachability Graph [LoopedNet1]\n----------------------------\nDescription: \nFilename: \n\nNodes\n----------------------------\n9: Node9 ([1, 0])\n10: Node10 ([0, 1])\n\nEdges\n----------------------------\n11: Edge11 9: Node9 ([1, 0]) -> 10: Node10 ([0, 1]) )\n13: Edge13 10: Node10 ([0, 1]) -> 9: Node9 ([1, 0]) )\n\n", rg.to_s
+    end
 end

data/test/tc_petri_net.rb

@@ -279,6 +279,11 @@ Edges
         assert_equal weight, @net.generate_weight_function
     end
 
+    def test_t_invariants
+        fill_net
+        assert BigDecimal("0.0") == @net.t_invariants.first
+    end
+
     def test_get_markings
         fill_net
         @net << PetriNet::Place.new(name: 'place2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petri_net
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.4
 platform: ruby
 authors:
 - cclausen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: graphviz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement