petri_net 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3862dd137aeee506ef93dc6c0247d5f872bb5dba
-  data.tar.gz: 1159a8fa6abde650583c95cd80a9d54a749b57e3
+  metadata.gz: 05aa522c5e70ab46c5873a40cffe845f288ab674
+  data.tar.gz: aef6cc24ebb8ceeb44788a3cbf962f967bddd3d1
 SHA512:
-  metadata.gz: ad0e40f4bfb501824223f2f36fc0dc32aa42391e8903fd2a21f5805f88ec946b91f7cf238124d6f7fb06da055d65c50301f44f3ca2b9fd9279469a683e0b2885
-  data.tar.gz: c43775deaab72b0f5a8c56a7040665d2762d7ac4ecbd07230bb4382cab51998fc9fd81fd4c653f32153dded901baab56d5761b8f69a1a12d3f7bf785075b01aa
+  metadata.gz: 0df2e5b3ca5598fc01e5835c6c79c3959df93d34b8620dd3734349842f4751718558ca10d0c8f00d106a646950b1a75ac65826f63a70cc3601d0564e321c435e
+  data.tar.gz: a64f758521a8a0a25b2343c41410330949d788b64e307de8725408865a8ac6f6bff5bd545eff7b226e96d7bc8d1209ee74509538e0eb353d7771e7112786f78e

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+- 1.9.3
+- jruby-19mode # JRuby in 1.9 mode
+- 2.0.0
+
+before_install:
+    gem install net-sftp
+
+script: 
+    rake test

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in petri.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    petri_net (0.6.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!

data/README.rdoc

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

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake/testtask'
-require 'hanna/rdoctask'
+#require 'hanna/rdoctask'
 require 'net/sftp'
 require 'fileutils'
 
@@ -13,12 +13,12 @@ Rake::TestTask.new(:test) do |t|
 	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"
-	rdoc.options << '--webcvs=http://svn.wildcoder.com/svn/petri/trunk/'
-	rdoc.rdoc_dir = 'doc' # rdoc output folder
-end
+#Rake::RDocTask.new(:rdoc) do |rdoc|
+#	rdoc.rdoc_files.include('LICENSE', 'CHANGELOG', 'README', 'lib/')
+#	rdoc.title = "PetriNet Documentation"
+#	rdoc.options << '--webcvs=http://svn.wildcoder.com/svn/petri/trunk/'
+#	rdoc.rdoc_dir = 'doc' # rdoc output folder
+#end
 
 desc 'Clean up unused files.'
 task :clean => :clobber_rdoc do

data/lib/petri_net/edge.rb

@@ -5,6 +5,8 @@ class PetriNet::ReachabilityGraph::Edge < PetriNet::Base
     attr_reader :id
     # Graph this edge belongs to
     attr_accessor :graph
+    # Probability of the relating transition
+    attr_accessor :probability
     
     # Creates an edge for PetriNet::ReachabilityGraph
     def initialize(options = {}, &block)
@@ -14,6 +16,7 @@ class PetriNet::ReachabilityGraph::Edge < PetriNet::Base
         @source = options[:source] 
         @destination = options[:destination]
         @label = (options[:label] or @name)
+        @probability = options[:probability]
 
         yield self unless block.nil?
     end
@@ -24,7 +27,7 @@ class PetriNet::ReachabilityGraph::Edge < PetriNet::Base
     end
 
     def to_gv
-        "\t#{@source.gv_id} -> #{@destination.gv_id};\n"
+        "\t#{@source.gv_id} -> #{@destination.gv_id}#{probability_to_gv};\n"
     end
 
     def ==(object)
@@ -35,4 +38,13 @@ class PetriNet::ReachabilityGraph::Edge < PetriNet::Base
         "#{@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/net.rb

@@ -305,7 +305,7 @@ class PetriNet::Net < PetriNet::Base
             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) unless current_node_id < 0
+                @graph.add_edge PetriNet::ReachabilityGraph::Edge.new(source: source, destination: current_node, probability: @objects[tid].probability) unless current_node_id < 0
                 reachability_helper get_markings, current_node unless (current_node_id < 0)
             end
             set_markings markings

data/lib/petri_net/place.rb

@@ -1,6 +1,8 @@
 class PetriNet::Place < PetriNet::Base
     # Unique ID
     attr_reader :id
+    # Needed to sanitize a Petrinet after merging
+    attr_writer :id
     # Human readable name
     attr_accessor :name
     # description

data/lib/petri_net/transition.rb

@@ -7,6 +7,8 @@ module PetriNet
         attr_accessor :name
         # Description
         attr_accessor :description
+        # Probability of firing (this moment)
+        attr_accessor :probability
         # List of input-arcs
         attr_reader   :inputs
         # List of output-arcs
@@ -21,6 +23,7 @@ module PetriNet
             @description = (options[:description] or "Transition #{@id}")
             @inputs = Array.new
             @outputs = Array.new
+            @probability = options[:probability]
 
             yield self unless block == nil
         end	
@@ -54,7 +57,7 @@ module PetriNet
 
         # GraphViz definition
         def to_gv
-            "\t#{self.gv_id} [ label = \"#{@name}\" ];\n"
+            "\t#{self.gv_id} [ label = \"#{@name}#{@probability ? ' ' + @probability.to_s : ''}\" ];\n"
         end
 
         def ==(object)

data/lib/petri_net/version.rb

@@ -0,0 +1,5 @@
+module PetriNet
+    VERSION = "0.6.0"
+    DEBUG = false
+end
+

data/petri_net.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/petri_net/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["cclausen"]
+  gem.email         = ["\"cclausen@tzi.de\""]
+  gem.description   = %q{A Petri net modeling gem}
+  gem.summary       = %q{You can create Petri Nets and do some calculations with them like generating the Reachability Graph}
+  gem.homepage      = "https://github.com/cclausen/petri"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "petri_net"
+  gem.require_paths = ["lib"]
+  gem.version       = PetriNet::VERSION
+  
+  gem.license       = 'MIT'
+  #gem.add_dependency "ruby-graphviz"
+  gem.add_development_dependency "net-sftp"
+end

data/test/tc_petri_net.rb

@@ -3,9 +3,9 @@
 require 'rubygems'
 require 'logger'
 require 'test/unit'
-require "#{`pwd`.strip}/../lib/petri_net" 
+require "#{File.dirname(__FILE__)}/../lib/petri_net" 
 
-require 'pry'
+#require 'pry'
 
 class TestPetriNet < Test::Unit::TestCase
     def setup

data/test/tc_transition.rb

@@ -1,4 +1,4 @@
-require "../lib/petri_net/transition"
+require "#{File.dirname(__FILE__)}/../lib/petri_net.rb"
 require "test/unit"
 
 class TestTransition < Test::Unit::TestCase

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: petri_net
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - cclausen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
-dependencies: []
+date: 2014-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Petri net modeling gem
 email:
 - '"cclausen@tzi.de"'
@@ -18,7 +32,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .ruby-version
+- .travis.yml
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -32,6 +49,8 @@ files:
 - lib/petri_net/place.rb
 - lib/petri_net/reachability_graph.rb
 - lib/petri_net/transition.rb
+- lib/petri_net/version.rb
+- petri_net.gemspec
 - test/create.rb
 - test/tc_arc.rb
 - test/tc_edge.rb
@@ -61,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: You can create Petri Nets and do some calculations with them like generating