cpee 1.3.141 → 1.3.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f727646483f63c20bd683be909a4f005c25527
-  data.tar.gz: 9c1ed21ea4c416c441ab704c3c258e33d1d404ac
+  metadata.gz: f729bc55e4293f383cc4b93627e0cfd32ce32659
+  data.tar.gz: 299679f674e22fd2957f4f4490a1365c6f709638
 SHA512:
-  metadata.gz: cf4a477d3d1ed014480e06ec6640f6dc054727e9ae64633a49bb0d33d921be3469dff058d02eae9f00e405a629a925f363db416227fe3f3b7d74387aaa8a1921
-  data.tar.gz: f924f355af613ea2b75910e9e091f712df7c446eacfa019313b75bb28fae9b7d18955488a2f646471d1b9e1c4f760c8dfd79adeacd26a81c2385a45671c30de1
+  metadata.gz: 21dc89b170d17f11cfd38ff838965416589970780949a67e465a37c2e59cd7d6e97930fb65f391d542b100e439f5eeb293b825a5725a5d744a71ee5a73c9e7bc
+  data.tar.gz: b2caf50ad1372911e2da106ca3c0719d22b2230ff96c9e4238cc70e02dd5bfc12a5c9da65aeb77d0e0910bcf9310ef7982042b979a94fec7b9ee1d231231ef7f

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.141"
+  s.version          = "1.3.142"
   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

@@ -180,6 +180,7 @@ module CPEE
             ### has identical branches with different conditions, we are fucked
             ### but how are the odds? right? right?
             traces.uniq!
+            puts '--> now on ' + down.to_s if debug
             debug_print debug, traces
             if node = traces.same_first
               if branch.condition? && branch.empty?
@@ -211,7 +212,9 @@ module CPEE
                     else
                       traces.shift_all
                     end
+                    puts '--> down to ' + (down + 1).to_s if debug
                     loops.remove_empty
+                    puts '--> up from ' + down.to_s if debug
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
                   else  
                     ### dont remove it, treat it as a normal conditional
@@ -221,7 +224,9 @@ module CPEE
                     ### add the blank conditional to get a break
                     len = loops.length
                     loops.add_breaks
+                    puts '--> down to ' + (down + 1).to_s if debug
                     build_ttree branch.last, loops.dup, nil, debug, down + 1
+                    puts '--> up from ' + down.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   
@@ -229,7 +234,9 @@ module CPEE
                   node.incoming -= loops.length
                   ### throw away the loop traces, remove loop traces from front of all other traces
                   traces.segment_by_loops loops
+                  puts '--> down to ' + (down + 1).to_s if debug
                   build_ttree branch, loops.dup, nil, debug, down + 1
+                  puts '--> up from ' + down.to_s if debug
                 end
                 traces.remove(loops)
                 traces.remove_empty
@@ -240,12 +247,17 @@ module CPEE
               tracesgroup.each do |trcs|
                 nb = branch.last.new_branch
                 if trcs.finished?
+                  puts '--> down to ' + (down + 1).to_s if debug
                   build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug, down + 1
+                  puts '--> up from ' + down.to_s if debug
                 else  
+                  puts '--> down to ' + (down + 1).to_s if debug
                   build_ttree nb, trcs, endnode, debug, down + 1
+                  puts '--> up from ' + down.to_s if debug
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end
+              traces.empty! if endnode.nil?
               ### all before is reduced to one incoming arrow
               ### if now there is still more than one incoming we have a loop situation
               ### where the end of a branching statement is also the starting/endpoint 

data/lib/cpee/processtransformation/structures.rb

@@ -264,6 +264,10 @@ module CPEE
           end  
         end
 
+        def empty!
+          self.delete_if{true}
+        end
+
         def remove_empty
           self.delete_if{|t| t.empty? }
         end
@@ -414,12 +418,14 @@ module CPEE
 
           # find common node (except loops)
           enode = nil
-          trcs.first.each do |n|
-            if trcs.include_in_all?(n)
-              enode = n
-              break
-            end  
-          end
+          unless trcs.empty?
+            trcs.first.each do |n|
+              if trcs.include_in_all?(n)
+                enode = n
+                break
+              end  
+            end
+          end  
           enode
         end  
 

metadata

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