cpee 1.3.148 → 1.3.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87acbb85884577657bf66ef831fe3b66647d555b
-  data.tar.gz: ebb7d0a3b8a0039fc100417fc8282386a51d1e3b
+  metadata.gz: b09e6b420f5ba75b5250cb7ee85760ef127d0271
+  data.tar.gz: 16f53a36334e46830224445c5fe4f1b7c3aebaf9
 SHA512:
-  metadata.gz: 35dcfe50fb95eb56b55db9648d73a71c80fde2260ef7ae440e245c9e597b72d1c5222769f878b2f6b1b30b48a0d36d19e96dcfc0612681203571cdc0d0256294
-  data.tar.gz: acd4feb783b9fe734446a33f3b7b2d9e3e0d807d2a20f14a259a67867f5c8ed163c6e00da8da1890f9f74ae3c2a2f6d548c9d9a3f3b1a01972f0edbd79b24788
+  metadata.gz: bb8dbe1ba4db3dbbec74f5ca328b4dca71edb9971bad971e7caedea60159bcb5cc0bc55112da8f21d4ebcfa5d8a1d007690f7dd77299b8ca4fa5a7b2c5013a1a
+  data.tar.gz: cd6d8ae87b13ac959b42c7418c4b5e4330c7cff4a72ef37069a34961884dc3002f7bef2663f549854dddb88f82e6a76b60430397a83f1c4b61d7cbeaa1376c60

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.148"
+  s.version          = "1.3.149"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/processtransformation/bpmn2.rb

@@ -141,7 +141,7 @@ module CPEE
           @tree
         end #}}}
     
-        def build_extraces(traces, node) #{{{
+        def  build_extraces(traces, node) #{{{
           dupt = traces.last.dup
           @graph.next_nodes(node).each_with_index do |n,i|
             traces << dupt.dup if i > 0
@@ -173,6 +173,10 @@ module CPEE
         end #}}}
         private :map_node
 
+        def print_node(niceid)
+          @graph.find_node(niceid)
+        end
+
         def build_ttree(branch,traces,enode=nil,debug=false,down=0)
           while not traces.finished?
             ### if traces exist more than once, make it so they exist only once
@@ -221,7 +225,7 @@ module CPEE
                     puts '--> down loop1 to ' + (down + 1).to_s if debug
                     loops.remove_empty
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
-                    puts '--> up loop1 from ' + down.to_s if debug
+                    puts '--> up loop1 from ' + (down + 1).to_s if debug
                   else
                     ### dont remove it, treat it as a normal conditional
                     ### an infinite loop that can only be left by break is created
@@ -232,7 +236,7 @@ module CPEE
                     loops.add_breaks
                     puts '--> down loop2 to ' + (down + 1).to_s if debug
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
-                    puts '--> up loop2 from ' + down.to_s if debug
+                    puts '--> up loop2 from ' + (down + 1).to_s if debug
                     ### set outgoing to number of loops (without the break) so that it can be ignored (should be 1 all the time)
                     node.outgoing -= len
                   end   
@@ -242,7 +246,7 @@ module CPEE
                   traces.segment_by_loops loops
                   puts '--> down loop3 to ' + (down + 1).to_s if debug
                   build_ttree branch, loops.dup, nil, debug, down + 1
-                  puts '--> up loop3 from ' + down.to_s if debug
+                  puts '--> up loop3 from ' + (down + 1).to_s if debug
                 end
                 traces.remove(loops)
                 traces.remove_empty
@@ -256,11 +260,11 @@ module CPEE
                 if trcs.finished?
                   puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug, down + 1
-                  puts '--> branch up from ' + down.to_s if debug
+                  puts '--> branch up from ' + (down + 1).to_s if debug
                 else  
                   puts '--> branch down to ' + (down + 1).to_s if debug
                   build_ttree nb, trcs, endnode, debug, down + 1
-                  puts '--> branch up from ' + down.to_s if debug
+                  puts '--> branch up from ' + (down + 1).to_s if debug
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end

data/lib/cpee/processtransformation/structures.rb

@@ -167,6 +167,10 @@ module CPEE
     class Graph #{{{
       attr_reader :flow, :nodes
 
+      def find_node(niceid)
+        @nodes.find{|k,v| v.niceid == niceid }
+      end
+
       def initialize
         @nodes = {}
         @links = []
@@ -303,6 +307,17 @@ module CPEE
           (n = self.map{|t| t.first }.uniq).length == 1 ? n.first : nil
         end
 
+        # future use
+        def incoming
+          if node = self.same_first
+            tcount = 1
+            self.each{|t| tcount += 1 if t.first == t.last }
+            tcount
+          else
+            raise "Wrong Question"
+          end  
+        end
+
         def include_in_all?(e)
           num = 0
           self.each{|n| num += 1 if n.include?(e)} 
@@ -388,12 +403,17 @@ module CPEE
             end
           end
 
+          # all before the largest common are just copied, so incoming should be 1
+          sh.each do |e|
+            break if e == max
+            e.incoming = 1
+          end  
+
           # if last is the largest common do nothing
           # else append from last to largest common
           self.each do |t|
             unless t.last == max
               last = t.last
-              t.last.incoming = 1
               if t.index(last) && t.index(max)
                 (t.index(last) + 1).upto(t.index(max)) do |i|
                   t << t[i]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.148
+  version: 1.3.149
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl