petri_net 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05aa522c5e70ab46c5873a40cffe845f288ab674
-  data.tar.gz: aef6cc24ebb8ceeb44788a3cbf962f967bddd3d1
+  metadata.gz: 4ac9fa5977f53b289d5fc97d42c14a2847b80c9c
+  data.tar.gz: d66436746d5f190ef3bf3c8361242ecb71dd5d6f
 SHA512:
-  metadata.gz: 0df2e5b3ca5598fc01e5835c6c79c3959df93d34b8620dd3734349842f4751718558ca10d0c8f00d106a646950b1a75ac65826f63a70cc3601d0564e321c435e
-  data.tar.gz: a64f758521a8a0a25b2343c41410330949d788b64e307de8725408865a8ac6f6bff5bd545eff7b226e96d7bc8d1209ee74509538e0eb353d7771e7112786f78e
+  metadata.gz: b1e585661a11b0ab1789454a4f401d85de55fecbafdf913663083f06c23d2686cbb9ba6e98e7db810358f78514aa998af8ad6be448ffae2480cb81c2aab6ba8a
+  data.tar.gz: 3fbcf881036c7f18f87f14b0b21d226bfcc81b14e33ea772c9d716cda5b5dcdd805949e2c54f825d57f3ca04f8e03b487208e21f4a6fbbd4ea420f5f2fc9aa79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    petri_net (0.6.0)
+    petri_net (0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/README.rdoc

@@ -1,10 +1,10 @@
-{<img src="https://travis-ci.org/cclausen/petri.png" />}[https://travis-ci.org/cclausen/petri]
+{<img src="https://travis-ci.org/cclausen/petri_net.png" />}[https://travis-ci.org/cclausen/petri_net]
 
-{<img src="https://codeclimate.com/github/cclausen/petri.png" />}[https://codeclimate.com/github/cclausen/petri]
+{<img src="https://codeclimate.com/github/cclausen/petri_net.png" />}[https://codeclimate.com/github/cclausen/petri_net]
 
 = PTNet: Petri-net Simulation in Ruby
 ===== based on the code by Brian D Nelson <bdnelson@wildcoder.com>
-===== Christian Clausen cclausen@tzi.de
+===== Christian Clausen <cclausen@tzi.de>
 
 == Version 0.6
 I implemented most of the basics you need for playing with PetriNets but there are a lot things to add.

data/Rakefile

@@ -1,24 +1,29 @@
 require 'rubygems'
+require 'rake'
 require 'rake/testtask'
-#require 'hanna/rdoctask'
+require 'rake/tasklib'
+require 'rdoc/rdoc'
+require 'rdoc/task'
+
 require 'net/sftp'
 require 'fileutils'
 
 desc 'Default task'
-task :default => [:test, :rdoc, :push, :clean]
+task :default => [:test, :rdoc, :clean]
 
 task(:test) { puts "==> Running main test suite" }
 Rake::TestTask.new(:test) do |t|
-	t.test_files = FileList['test/tc_*.rb']
+	t.test_files = FileList['test/ts_all']
 	t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-#Rake::RDocTask.new(:rdoc) do |rdoc|
-#	rdoc.rdoc_files.include('LICENSE', 'CHANGELOG', 'README', 'lib/')
-#	rdoc.title = "PetriNet Documentation"
+Rake::RDocTask.new(:rdoc) do |rdoc|
+        rdoc.main = "README"
+	rdoc.rdoc_files.include('LICENSE', 'CHANGELOG','lib/')
+	rdoc.title = "PetriNet Documentation"
 #	rdoc.options << '--webcvs=http://svn.wildcoder.com/svn/petri/trunk/'
-#	rdoc.rdoc_dir = 'doc' # rdoc output folder
-#end
+	rdoc.rdoc_dir = 'doc' # rdoc output folder
+end
 
 desc 'Clean up unused files.'
 task :clean => :clobber_rdoc do

data/lib/petri_net/net.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 class PetriNet::Net < PetriNet::Base
     # Human readable name
     attr_accessor :name
@@ -152,27 +154,22 @@ class PetriNet::Net < PetriNet::Base
 
     # Stringify this Petri Net.
     def to_s
-        str = "Petri Net [#{@name}]\n"
-        str += "----------------------------\n"
-        str += "Description: #{@description}\n"
-        str += "Filename: #{@filename}\n"
-        str += "\n"
-
-        str += "Places\n"
-        str += "----------------------------\n"
-        @places.each_value {|p| str += @objects[p].to_s + "\n" }
-        str += "\n"
-
-        str += "Transitions\n"
-        str += "----------------------------\n"
-        @transitions.each_value {|t| str += @objects[t].to_s + "\n" }
-        str += "\n"
-
-        str += "Arcs\n"
-        str += "----------------------------\n"
-        @arcs.each_value {|a| str += @objects[a].to_s + "\n"}
-        str += "\n"
-
+        str = 
+%{Petri Net [#{@name}]
+----------------------------
+Description: #{@description}
+Filename: #{@filename}
+
+Places
+----------------------------
+#{str = ''; @places.each_value {|p| str += @objects[p].to_s + "\n"}; str }
+Transitions
+----------------------------
+#{str = ''; @transitions.each_value {|t| str += @objects[t].to_s + "\n" }; str }
+Arcs
+----------------------------
+#{str = ''; @arcs.each_value {|a| str += @objects[a].to_s + "\n" }; str}
+}
         return str
     end
 
@@ -289,6 +286,14 @@ class PetriNet::Net < PetriNet::Base
         @objects.find_index object
     end
 
+    def save filename
+        File.open(filename, 'w') {|f| @net.to_yaml}
+    end
+
+    def load filename
+        @net = YAML.load(File.read(filename))
+    end
+
     private
 
     def changed_structure
@@ -306,6 +311,9 @@ class PetriNet::Net < PetriNet::Base
                 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.getNode(current_node_id * -1).add_omega current_node
+                end
                 reachability_helper get_markings, current_node unless (current_node_id < 0)
             end
             set_markings markings

data/lib/petri_net/reachability_graph/graph.rb

@@ -0,0 +1,118 @@
+class PetriNet::InfiniteReachabilityGraphError < RuntimeError
+end
+
+class PetriNet::ReachabilityGraph < 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)
+        @nodes.each_value do |n|
+            begin
+                if node > @objects[n]
+                    if @unlimited
+                        return @objects[n].id *-1
+                    else
+                        raise PetriNet::ReachabilityGraph::InfiniteReachabilityGraphError
+                    end
+                end
+            rescue ArgumentError
+                #just two different markings, completly ok
+            end
+        end
+        node_index = @objects.index node
+        if (!node_index.nil?)
+            return @objects[node_index].id * -1
+        end
+
+        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
+
+    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
+        # General graph options
+        str = "digraph #{@name} {\n"
+        str += "\t// General graph options\n"
+        str += "\trankdir = LR;\n"
+        str += "\tsize = \"10.5,7.5\";\n"
+        str += "\tnode [ style = filled, fillcolor = white, fontsize = 8.0 ]\n"
+        str += "\tedge [ arrowhead = vee, arrowsize = 0.5, fontsize = 8.0 ]\n"
+        str += "\n"
+
+        str += "\t// Nodes\n"
+        str += "\tnode [ shape = circle ];\n"
+        @nodes.each_value {|id| str += @objects[id].to_gv }
+        str += "\n"
+
+        str += "\t// Edges\n"
+        @edges.each_value {|id| str += @objects[id].to_gv }
+        str += "}\n"    # Graph closure
+
+        return str
+
+    end
+
+    def to_s
+        str = "Reachability 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/reachability_graph/node.rb

@@ -0,0 +1,119 @@
+class PetriNet::ReachabilityGraph::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
+
+    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] 
+        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 
+        if object.class.to_s == "PetriNet::ReachabilityGraph::Node"
+            if self > object
+                counter = 0
+                object.markings.each do |marking|
+                    if @markings[counter] < marking 
+                        @markings[counter] = Fload::INFINITY 
+                    end
+                    counter += 1
+                end
+            else
+                return false
+            end
+        elsif object.class.to_s == "Array"
+            object.each do |place|
+                markings[place] = Float::INFINITY
+            end
+        elsif object.class.to_s == "Fixnum"
+            markings[object] = Float::INFINITY
+        end
+        @omega_marked = true
+    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/reachability_graph.rb

@@ -1,4 +1,8 @@
+require_relative 'reachability_graph/graph'
+require_relative 'reachability_graph/node'
+require_relative 'reachability_graph/edge'
 class PetriNet::ReachabilityGraph < PetriNet::Base
+=begin 
     def initialize(net)
         @objects = Array.new
         @nodes = Hash.new
@@ -89,5 +93,5 @@ class PetriNet::ReachabilityGraph < PetriNet::Base
 
         return str
     end
-
+=end
 end

data/lib/petri_net/version.rb

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

data/lib/petri_net.rb

@@ -31,5 +31,3 @@ require "#{PETRI_LIB_FILE_PATH}/petri_net/transition"
 require "#{PETRI_LIB_FILE_PATH}/petri_net/arc"
 require "#{PETRI_LIB_FILE_PATH}/petri_net/marking"
 require "#{PETRI_LIB_FILE_PATH}/petri_net/reachability_graph"
-require "#{PETRI_LIB_FILE_PATH}/petri_net/node"
-require "#{PETRI_LIB_FILE_PATH}/petri_net/edge"

data/test/reachability_graph/tc_graph.rb

@@ -0,0 +1,61 @@
+require 'rubygems'
+require 'logger'
+require 'test/unit'
+
+class TestPetriNetReachabilityGraph < Test::Unit::TestCase
+    def setup
+        @net = PetriNet::Net.new(:name => 'Water', :description => 'Creation of water from base elements.')	
+        @net.logger = Logger.new(STDOUT)
+    end
+
+    def fill_net
+        @net << PetriNet::Place.new(:name => "testplace")
+        @net << PetriNet::Transition.new(:name => "testtrans")
+        arc = PetriNet::Arc.new do |a|
+            a.name = 'testarc'
+            a.weight = 2
+            a.add_source(@net.get_place 'testplace')
+            a.add_destination(@net.get_transition 'testtrans')
+        end
+        @net << arc 
+    end
+
+    def teardown
+        @net.reset
+    end
+
+    def test_trivial_generate_reachability_graph
+assert_equal "Reachability Graph [Water]
+----------------------------
+Description: 
+Filename: 
+
+Nodes
+----------------------------
+1: Node1 ([])
+
+Edges
+----------------------------
+
+", @net.generate_reachability_graph().to_s, "Simple Reachability Graph with only one reachable state"
+    end
+
+def test_generate_reachability_graph
+    fill_net
+assert_equal "Reachability Graph [Water]
+----------------------------
+Description: 
+Filename: 
+
+Nodes
+----------------------------
+4: Node4 ([0])
+
+Edges
+----------------------------
+
+", @net.generate_reachability_graph().to_s, "Reachability Graph of sample net"
+    end
+
+
+end

data/test/reachability_graph/tc_node.rb

@@ -0,0 +1,67 @@
+#!/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.')
+        @node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,4,0])
+    end
+
+    def teardown
+        @net.reset
+    end
+
+    def test_create_node
+        node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,4,0])
+        assert_not_nil node
+        assert_equal "Node2", node.name
+        assert_equal [], node.inputs
+        assert_equal [], node.outputs
+        assert_equal node.name, node.label
+        assert_equal [1,3,5,4,0], node.markings
+        assert !node.omega_marked, "should not be omega_marked as there is no omega-marking"
+    end
+
+    def test_omega_marking
+        node = PetriNet::ReachabilityGraph::Node.new(markings: [1,3,5,Float::INFINITY,0])
+        assert node.omega_marked, "should be omega_marked as there is an omega marking"
+    end
+
+    def test_adding_omega_marking
+        assert !@node.omega_marked
+        @node.add_omega 3
+        assert_equal [1,3,5,Float::INFINITY,0], @node.markings
+        assert @node.omega_marked
+    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])
+
+        assert node1 == node1
+        assert node2 == node2
+        assert node1 == node2
+        assert !(node1 < node2)
+        assert !(node1 > node2)
+        assert !(node3 == node1)
+        assert_raise ArgumentError do node3 > node1 end
+        assert_raise ArgumentError do node3 < node1 end
+        assert node4 > node1
+        assert node1 < node4
+        assert node5 > node1
+        assert !(node4 == node5)
+        assert_raise ArgumentError do node4 > node5 end
+        assert_raise ArgumentError do node6 > node1 end
+
+    end
+end

data/test/tc_petri_net.rb

@@ -5,7 +5,6 @@ require 'logger'
 require 'test/unit'
 require "#{File.dirname(__FILE__)}/../lib/petri_net" 
 
-#require 'pry'
 
 class TestPetriNet < Test::Unit::TestCase
     def setup
@@ -255,6 +254,12 @@ Edges
         assert_equal 3, @net.objects_size
     end
 
+    def test_save_and_load
+        fill_net
+        @net.save("/tmp/petrinet")
+        net = YAML.load(File.read("/tmp/petrinet"))
+        assert_not_nil net
+    end
 
  #   def test_create_marking
  #       place = PetriNet::Place.new(:name => 'Hydrogen')

data/test/ts_all.rb

@@ -0,0 +1,2 @@
+require_relative "./ts_petri_net"
+require_relative "./ts_reachability_graph"

data/test/ts_petri_net.rb

@@ -0,0 +1,4 @@
+require_relative 'tc_petri_net'
+require_relative 'tc_place'
+require_relative 'tc_transition'
+require_relative 'tc_arc'

data/test/ts_reachability_graph.rb

@@ -0,0 +1,3 @@
+require_relative 'reachability_graph/tc_graph.rb'
+require_relative 'reachability_graph/tc_node.rb'
+require_relative 'reachability_graph/tc_edge.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petri_net
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - cclausen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
@@ -42,24 +42,27 @@ files:
 - lib/petri_net.rb
 - lib/petri_net/arc.rb
 - lib/petri_net/base.rb
-- lib/petri_net/edge.rb
 - lib/petri_net/marking.rb
 - lib/petri_net/net.rb
-- lib/petri_net/node.rb
 - lib/petri_net/place.rb
 - lib/petri_net/reachability_graph.rb
+- lib/petri_net/reachability_graph/edge.rb
+- lib/petri_net/reachability_graph/graph.rb
+- lib/petri_net/reachability_graph/node.rb
 - lib/petri_net/transition.rb
 - lib/petri_net/version.rb
 - petri_net.gemspec
 - test/create.rb
+- test/reachability_graph/tc_edge.rb
+- test/reachability_graph/tc_graph.rb
+- test/reachability_graph/tc_node.rb
 - test/tc_arc.rb
-- test/tc_edge.rb
-- test/tc_graph.rb
-- test/tc_node.rb
 - test/tc_petri_net.rb
 - test/tc_place.rb
 - test/tc_transition.rb
-- test/ts_test_all.rb
+- test/ts_all.rb
+- test/ts_petri_net.rb
+- test/ts_reachability_graph.rb
 homepage: https://github.com/cclausen/petri
 licenses:
 - MIT
@@ -87,11 +90,13 @@ summary: You can create Petri Nets and do some calculations with them like gener
   the Reachability Graph
 test_files:
 - test/create.rb
+- test/reachability_graph/tc_edge.rb
+- test/reachability_graph/tc_graph.rb
+- test/reachability_graph/tc_node.rb
 - test/tc_arc.rb
-- test/tc_edge.rb
-- test/tc_graph.rb
-- test/tc_node.rb
 - test/tc_petri_net.rb
 - test/tc_place.rb
 - test/tc_transition.rb
-- test/ts_test_all.rb
+- test/ts_all.rb
+- test/ts_petri_net.rb
+- test/ts_reachability_graph.rb

data/lib/petri_net/node.rb

@@ -1,44 +0,0 @@
-class PetriNet::ReachabilityGraph::Node < PetriNet::Base
-    # 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
-
-    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] 
-
-        yield self unless block.nil?
-    end
-
-    def validate
-        true
-    end
-
-    def gv_id
-        "N#{@id}"
-    end
-
-    def to_gv
-        "\t#{self.gv_id} [ label = \"#{@markings}\" ];\n"
-    end
-
-    def ==(object)
-        return false unless object.class.to_s == "PetriNet::ReachabilityGraph::Node"
-        @markings == object.markings
-    end
-
-    def to_s
-        "#{@id}: #{@name} (#{@markings})"
-    end
-
-end

data/test/ts_test_all.rb

@@ -1,2 +0,0 @@
-require "./tc_petri_net"
-require "./tc_transition"