cpee 1.3.159 → 1.3.160

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c839fcbe55d2d855568d6467466d136d756288c
-  data.tar.gz: 74c5767ec1e718a38f440c01005922f54ba90920
+  metadata.gz: 1db33f357360202a3eebfe4f375eb149fc5e6d1f
+  data.tar.gz: 83c7b07ca81a93a19d2d4062582728ef1dbc4a29
 SHA512:
-  metadata.gz: 532002e583957edbb012a7f9e62282680fc1dd59c5c495349762250de952822f96ccd94664ed05f9eab26306a4edd537aed9fc9001a0a1425117049a8b0cab21
-  data.tar.gz: d4bcf178ce517f1df5cbd3f3278976d6c1da7610f74db0084d459cf321eb2a5a160c06896dcba9a8f04e8c88a3108f86f11a5c127ac13b3c09aea00163f2ecac
+  metadata.gz: 0e16f74611ae052df0e6e2b79cdbc8c4e82cb588839ac132b062610c71476bb816fedc0c789fbb23362803c81b1e489301d434294c8b577def9d7cda66037faf
+  data.tar.gz: 8d734498c1a896361ee8150d7cfb728001df38e032368ae7b03197cb1cd688e5d0c99a8fe840b4ec7f31a57cd46b37e08271c1eb82cf047784fce8cedead5f10

data/cpee.gemspec

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

@@ -155,16 +155,16 @@ module CPEE
         end #}}}
         private :build_extraces
 
-        def map_node(node) #{{{
+        def map_node(node,flat) #{{{
           case node.type
             when :parallelGateway
-              Parallel.new(node.id,node.type)
+              flat ? nil : Parallel.new(node.id,node.type)
             when :exclusiveGateway
-              Conditional.new(node.id,:exclusive,node.type)
+              flat ? nil : Conditional.new(node.id,:exclusive,node.type)
             when :eventBasedGateway
-              Parallel.new(node.id,node.type,1)
+              flat ? nil : Parallel.new(node.id,node.type,1)
             when :inclusiveGateway
-              Conditional.new(node.id,:inclusive,node.type)
+              flat ? nil : Conditional.new(node.id,:inclusive,node.type)
             when :endEvent, :startEvent, nil
               nil
             else
@@ -206,57 +206,39 @@ module CPEE
                   end  
                 end  
               end
-              nic = traces.incoming(node)
               if node == enode
                 traces.shift_all
-              elsif nic == 1 || branch.is_a?(CPEE::ProcessTransformation::InfiniteLoop)
+              elsif traces.incoming(node) == 1
                 traces.shift_all
-                n = map_node(node)
-                if !(n.nil? || (n.container? && (node.outgoing <=1 || traces.finished?)))
+                n = map_node(node,traces.same_first)
+                if !n.nil? && !(n.container? && traces.finished?)
                   (branch << n).compact!
                 end
               else
                 loops = traces.loops
                 if node.type == :exclusiveGateway || traces.all_loops?
-                  ### as the first is a decision node, just remove and continue
-                  ### change to nic
-                  if node.incoming == 2
-                    node.incoming = 1
-                    branch << Loop.new(node.id)
-                    if traces.all_loops?
-                      ### if all loops, tail loop thus remove the loopback
-                      loops.pop_all
-                    else
-                      ### remove the gateway itself, as for a single loop it is no longer used.
-                      traces.shift_all
-                    end
-                    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 + 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
-                    node.incoming = 1
-                    branch << InfiniteLoop.new(node.id)
-                    ### add the blank conditional to get a break
-                    len = loops.length
-                    loops.add_breaks(self.object_id)
-                    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 + 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   
+                  ### an infinite loop that can only be left by break is created
+                  ### at the output time it is decided wether this can be optimized
+                  branch << Loop.new(node.id)
+                  ### duplicate because we need it later to remove all the shit from traces
+                  lops = loops.dup
+                  ### remove the exclusive gateway because we no longer need it
+                  lops.add_breaks(self.object_id)
+                  lops.shift_all
+                  ### add the blank conditional to get a break
+                  puts '--> down head_loop to ' + (down + 1).to_s if debug
+                  build_ttree branch, lops, nil, debug, down + 1
+                  puts '--> up head_loop from ' + (down + 1).to_s if debug
+                  traces.remove(loops)
+                  traces.shift_all
                 else
-                  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 loop3 to ' + (down + 1).to_s if debug
+                  puts '--> down tail_loop to ' + (down + 1).to_s if debug
                   build_ttree branch, loops.dup, nil, debug, down + 1
-                  puts '--> up loop3 from ' + (down + 1).to_s if debug
+                  puts '--> up tail_loop from ' + (down + 1).to_s if debug
+                  traces.remove(loops)
                 end
-                traces.remove(loops)
                 traces.remove_empty
               end
             else
@@ -267,14 +249,13 @@ module CPEE
                 nb = branch.last.new_branch
                 if trcs.finished?
                   puts '--> branch down to ' + (down + 1).to_s if debug
-                  build_ttree nb, Traces.new([[Break.new(self.object_id,1)]]), endnode, debug, down + 1
+                  build_ttree nb, Traces.new([[Break.new(self.object_id)]]), endnode, debug, down + 1
                   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 + 1).to_s if debug
                 end  
-                endnode.incoming -= 1 unless endnode.nil?
               end
               # remove all traces that don't start with endnode to account for loops
               if endnode.nil?
@@ -282,11 +263,6 @@ module CPEE
               else  
                 traces.remove_by_endnode(endnode)
               end  
-              ### 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 
-              ### of a loop
-              endnode.incoming += 1 unless endnode.nil?
             end
           end
         end

data/lib/cpee/processtransformation/cpee.rb

@@ -55,12 +55,17 @@ module CPEE
           generate_for_list(node,s1)
         end
         def print_Loop_default(node,res)
-          s1 = res.add('loop', 'pre_test' => node.condition.empty? ? 'true' : node.condition.join(' && '))
-          s1.attributes['language'] = node.condition_type unless node.condition_type.nil?
-          node.attributes.each do |k,v|
-            s1.attributes[k] = v
+          if node.sub.length == 2
+            s1 = res.add('loop', 'pre_test' => node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && '))
+            s1.attributes['language'] = node.sub[0].condition_type unless node.sub[0].condition_type.nil?
+            node.sub[0].attributes.each do |k,v|
+              s1.attributes[k] = v
+            end
+            generate_for_list(node.sub[0],s1)
+          else  
+            s1 = res.add('loop', 'pre_test' => 'true')
+            print_Conditional(node,s1)
           end
-          generate_for_list(node,s1)
           s1
         end
         private :print_Loop_default

data/lib/cpee/processtransformation/structures.rb

@@ -74,8 +74,8 @@ module CPEE
     end #}}}
 
     class Break < Node
-      def initialize(context,incoming)
-        super context, '-1', :break, 'BREAK', incoming, []
+      def initialize(context)
+        super context, '-1', :break, 'BREAK', 1, []
       end
     end
 
@@ -101,31 +101,27 @@ module CPEE
         @id = id
       end
     end #}}}
-    class InfiniteLoop < Array #{{{
+    class Loop #{{{
       include Container
-      def condition?; false; end
-      attr_reader :attributes
-      attr_accessor :id, :type
-      def initialize(id)
-        @container = true
-        @id = id
-        @type = :loop
-        @attributes = {}
-      end  
-    end #}}}
-    class Loop < Array #{{{
-      include Container
-      attr_accessor :id, :type, :condition, :condition_type
+      include Struct
+      include Enumerable
+      attr_reader :id, :sub, :mode
+      attr_accessor :type, :condition, :condition_type
       attr_reader :attributes
       def condition?; true; end
       def initialize(id)
         @container = true
         @id = id
         @type = :loop
+        @mode = :exclusive
         @condition = []
+        @sub = []
         @condition_type = nil
         @attributes = {}
       end  
+      def new_branch
+        (@sub << Alternative.new(@id)).last
+      end
     end #}}}
 
     class Parallel #{{{
@@ -330,10 +326,9 @@ module CPEE
           self.each{|n| num += 1 if n.include?(e)} 
           num == self.length
         end
-        def same_position_in_all?(e,i)
-          num = 0
-          self.each{|n| num += 1 if n[i] == e}
-          num == self.length
+
+        def aaa
+          puts 'rrr'
         end
 
         def all_loops?
@@ -342,12 +337,11 @@ module CPEE
           num == self.length
         end
 
-
         def add_breaks(context)
           trueloops = self.find_all{ |t| t.last == t.first }.length
-          tb = Break.new(context,1)
+          tb = Break.new(context)
           if trueloops == self.length
-            self << [self.first_node] ### the blank conditional so that we get a break
+            self << [nil,tb]
           else
             self.each do |t|
               t << tb unless t.last == t.first ### an explicit break
@@ -400,22 +394,13 @@ module CPEE
 
         def extend
           # find largest common
-          max = nil
+          max = []
           sh = self.shortest
           sh = sh[0..-2] if sh.first == sh.last
           sh.each_with_index do |e,i|
-            if self.same_position_in_all?(e,i)
-              max = e
-            else  
-              break
-            end
+            max << e if self.include_in_all?(e)
           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  
+          max = max.last
 
           # if last is the largest common do nothing
           # else append from last to largest common
@@ -430,7 +415,6 @@ module CPEE
             end  
           end
 
-          max.incoming = self.length + 1
           max
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.159
+  version: 1.3.160
 platform: ruby
 authors:
 - Juergen eTM Mangler