cpee-transformation 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61bbed7eec2d5c90a7e146f5c1bc3e59c0ffaffe191a0d7ba51c8ab43de21433
-  data.tar.gz: 660d67bf5dad21acdd20776be18aa44374242403321f1a405444eba0c44a395a
+  metadata.gz: 8702f90089fd5baaddfa08045af0abcacfb5b253d8396827eb99daabb200e596
+  data.tar.gz: 6f7d4a223a40d261c3029ae7742378f379b5be304103aedd2661d514405c9994
 SHA512:
-  metadata.gz: bec2f7ae1f8ed396de9162eb1cb7226b1a4bbb1244562b2f901931ea54960b8341f8e5776cdae5876366fc3091306887b3ae9f9673d189141ce774a87e2abef3
-  data.tar.gz: c13eece54bee6c22e51029d1b311f044b251d687cb5a83baeb24485554b7ee2840f38c33bc5c763398225fc283b161390ce49577904558458217fe3278adb6c1
+  metadata.gz: 984586caa45d868466e5e14ff79b2f44fe1df8e82c4dafb8eac0c4874e555242a731859a34ea57acd0b68ca7fbcbe16cd2682e4af52880dcf845d8174528f165
+  data.tar.gz: 57b36295c10df9062d2da0ab2b1c9e0803b6e5a49099177d183abf7959dd08918a80a22b5880453a9bbb1bc4ece1a34ab29840182e6731667b8f54bfb306cb05

data/cpee-transformation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-transformation"
-  s.version          = "1.0.1"
+  s.version          = "1.0.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "CPEE Transformation between different formats"

data/lib/cpee/transformation/beautiful.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'structures'

data/lib/cpee/transformation/bpmn2.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'structures'
@@ -74,7 +74,10 @@ module CPEE
 
         def extract_nodelink(doc) #{{{
           doc.find("/bm:definitions/bm:process/bm:*[@id and @name and not(@itemSubjectRef) and not(name()='sequenceFlow')]").each do |e|
-            n = Node.new(self.object_id,e.attributes['id'],e.qname.name.to_sym,e.attributes['name'].strip,e.find('count(bm:incoming)'),e.find('count(bm:outgoing)'))
+            type = e.qname.name.to_sym
+            ### an end event with a terminate definition ends the whole process
+            type = :terminate if type == :endEvent && e.find('bm:terminateEventDefinition').any?
+            n = Node.new(self.object_id,e.attributes['id'],type,e.attributes['name'].strip,e.find('count(bm:incoming)'),e.find('count(bm:outgoing)'))
 
             if e.attributes['scriptFormat'] != ''
               n.script_type = e.attributes['scriptFormat']
@@ -113,12 +116,13 @@ module CPEE
             @start = n if n.type == :startEvent && @start == nil
           end
 
-          # extract all sequences to a links
+          # extract all sequences to a links, default flows of gateways are otherwise
+          defaults = doc.find("/bm:definitions/bm:process/bm:*[@default]/@default").map{ |d| d.value }
           doc.find("/bm:definitions/bm:process/bm:sequenceFlow").each do |e|
             source = e.attributes['sourceRef']
             target = e.attributes['targetRef']
             cond = e.find('bm:conditionExpression')
-            @graph.add_link Link.new(source, target, cond.empty? ? nil : cond.first.text.strip)
+            @graph.add_link Link.new(source, target, cond.empty? ? nil : cond.first.text.strip, defaults.include?(e.attributes['id']))
           end
 
           @graph.clean_up do |node|

data/lib/cpee/transformation/cpee.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'target'
@@ -56,19 +56,19 @@ module CPEE
         end
 
         def dive(node,n1=nil,condition=nil,otherwise=false)
-          if node.children.empty?
+          if node.children.empty? || node.text_only?
             return n1
           end
           if n1.nil?
             nid = id_find(node.attributes['id'] || node.attributes['eid'])
-            n1 = @start = Node.new(0,nid,:startEvent,'',0,1)
+            n1 = @start = Node.new(self.object_id,nid,:startEvent,'',0,1)
           end
           node.children.each do |ele|
             case ele.qname.name
               when 'loop'
                 if ele.attributes['mode'] == 'pre_test'
                   nid = id_find(ele.attributes['eid'])
-                  nx = Node.new(0,nid,:exclusiveGateway,nil,2,2)
+                  nx = Node.new(self.object_id,nid,:exclusiveGateway,nil,2,2)
                   @graph.add_node nx
                   @graph.add_link Link.new(n1.id, nx.id, condition, otherwise)
 
@@ -79,14 +79,14 @@ module CPEE
                   n1 = nx
                 else
                   nid = id_find(ele.attributes['eid'])
-                  nx = Node.new(0,nid,:exclusiveGateway,nil,2,1)
+                  nx = Node.new(self.object_id,nid,:exclusiveGateway,nil,2,1)
                   @graph.add_node nx
                   @graph.add_link Link.new(n1.id, nx.id, condition, otherwise)
                   condition = nil
 
                   bn = dive ele, nx, ele.attributes['condition']
 
-                  no = Node.new(0,nid + 'e',:exclusiveGateway,nil,1,2)
+                  no = Node.new(self.object_id,nid + 'e',:exclusiveGateway,nil,1,2)
                   @graph.add_node no
                   @graph.add_link Link.new(bn.id, no.id)
                   @graph.add_link Link.new(no.id, nx.id, ele.attributes['condition'])
@@ -94,7 +94,7 @@ module CPEE
                 end
               when 'call'
                 nid = id_find(ele.attributes['id'])
-                no = Node.new(0,nid,:task,ele.find("string(d:parameters/d:label)"),1,1)
+                no = Node.new(self.object_id,nid,:task,ele.find("string(d:parameters/d:label)"),1,1)
                 no.methods << ele.find("string(d:parameters/d:method)")
                 no.endpoints << ele.attributes['endpoint']
                 ele.find("d:parameters/d:arguments/d:*").each do |e|
@@ -110,7 +110,7 @@ module CPEE
                 n1 = no
               when 'manipulate'
                 nid = id_find(ele.attributes['id'])
-                no = Node.new(0,nid,:scriptTask,ele.attributes['label'].to_s,1,1)
+                no = Node.new(self.object_id,nid,:scriptTask,ele.attributes['label'].to_s,1,1)
                 no.script_type = 'application/x-ruby'
                 no.script = ele.find("string(d:code)")
                 @graph.add_link Link.new(n1.id, no.id, condition, otherwise)
@@ -120,12 +120,12 @@ module CPEE
               when 'parallel'
                 bra = ele.find('d:parallel_branch')
                 nid = id_find(ele.attributes['eid'])
-                ns = Node.new(0,nid,:parallelGateway,nil,1,bra.length)
+                ns = Node.new(self.object_id,nid,:parallelGateway,nil,1,bra.length)
                 ns.attributes[:wait] = ele.attributes['wait'] || -1
                 ns.attributes[:cancel] = ele.attributes['cancel'] || 'last'
                 @graph.add_link Link.new(n1.id, ns.id, condition, otherwise)
                 condition = nil
-                ne = Node.new(0,nid + 'e',:parallelGateway,nil,1,bra.length)
+                ne = Node.new(self.object_id,nid + 'e',:parallelGateway,nil,1,bra.length)
                 @graph.add_node ns
                 @graph.add_node ne
                 bra.each do |br|
@@ -136,10 +136,10 @@ module CPEE
               when 'choose'
                 nid = id_find(ele.attributes['eid'])
                 bra = ele.find('d:alternative|d:otherwise')
-                ns = Node.new(0,nid,:exclusiveGateway,ele.attributes['label'],1,bra.length)
+                ns = Node.new(self.object_id,nid,:exclusiveGateway,ele.attributes['label'],1,bra.length)
                 @graph.add_link Link.new(n1.id, ns.id, condition, otherwise)
                 condition = nil
-                ne = Node.new(0,nid + 'e',:exclusiveGateway,nil,1,bra.length)
+                ne = Node.new(self.object_id,nid + 'e',:exclusiveGateway,nil,1,bra.length)
                 @graph.add_node ns
                 @graph.add_node ne
                 bra.each do |br|
@@ -153,7 +153,14 @@ module CPEE
                 n1 = ne
               when 'escape'
                 nid = id_find(ele.attributes['eid'])
-                no = Node.new(0,nid,:break,'',1,1)
+                no = Node.new(self.object_id,nid,:break,'',1,1)
+                @graph.add_link Link.new(n1.id, no.id, condition, otherwise)
+                @graph.add_node no
+                condition = nil
+                n1 = no
+              when 'terminate'
+                nid = id_find(ele.attributes['eid'])
+                no = Node.new(self.object_id,nid,:terminate,'',1,0)
                 @graph.add_link Link.new(n1.id, no.id, condition, otherwise)
                 @graph.add_node no
                 condition = nil
@@ -168,7 +175,7 @@ module CPEE
           doc = XML::Smart::string(text)
           doc.register_namespace :d, 'http://cpee.org/ns/description/1.0'
           bn = dive doc.root
-          ne = Node.new(0,Digest::MD5.hexdigest(Kernel::rand().to_s),:endEvent,'',1,0)
+          ne = Node.new(self.object_id,Digest::MD5.hexdigest(Kernel::rand().to_s),:endEvent,'',1,0)
           @graph.add_node ne
           @graph.add_link Link.new(bn.id, ne.id)
         end
@@ -197,6 +204,11 @@ module CPEE
             res
           end
 
+          def print_Terminate(node,res)
+            res.add('terminate', 'a:alt_id' => node.id)
+            res
+          end
+
           def print_Loop(node,res)
             eid = "e#{(@eid += 1)}"
             if node.sub.length == 2 && node.sub[1].condition.empty? && ((node.sub[1].length == 1 && node.sub[1][0].class.name.gsub(/\w+:+/,'') == 'Break') ||  node.sub[1].length == 0)
@@ -207,10 +219,12 @@ module CPEE
               end
               generate_in_list(node.sub[0],s1)
             else
-              s1 = res.add('loop', 'mode' => node.mode, 'condition' => node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && '), 'eid' => eid)
               if node.sub.length == 1
+                s1 = res.add('loop', 'mode' => node.mode, 'condition' => node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && '), 'eid' => eid)
                 generate_in_list(node.sub[0],s1)
               else
+                ### the choose over all alternatives decides (escape), so loop forever
+                s1 = res.add('loop', 'mode' => node.mode, 'condition' => 'true', 'eid' => eid)
                 print_Conditional(node,s1)
               end
             end
@@ -273,21 +287,20 @@ module CPEE
 
           def print_Conditional(node,res)
             eid = "e#{(@eid += 1)}"
-            s1 = res.add('d:choose', 'label' => node.label, 'mode' => node.mode == :inclusive ? 'inclusive' : 'exclusive', 'a:alt_id' => node.id, 'eid' => eid)
-            otherwise = false
+            s1 = res.add('d:choose', 'label' => node.respond_to?(:label) ? node.label : '', 'mode' => node.mode == :inclusive ? 'inclusive' : 'exclusive', 'a:alt_id' => node.id, 'eid' => eid)
+            ### the otherwise is the explicit one, else the last branch without condition
+            ### (keeps the order stable), compare by identity as empty branches are ==
+            ow = node.sub.reverse.find{ |b| b.condition.empty? && b.otherwise } || node.sub.reverse.find{ |b| b.condition.empty? }
             node.sub.each do |branch|
               bid = "e#{(@eid += 1)}"
               s2 = if branch.condition.any?
                 a = s1.add('d:alternative','condition' => branch.condition.join(' or '), 'eid' => bid)
                 a.attributes['language'] = branch.condition_type unless branch.condition_type.nil?
                 a
+              elsif branch.equal?(ow)
+                s1.add('d:otherwise', 'eid' => bid)
               else
-                if branch.otherwise || !otherwise
-                  otherwise = true
-                  s1.add('d:otherwise', 'eid' => bid)
-                else
-                  s1.add('d:alternative', 'condition' => '', 'eid' => bid)
-                end
+                s1.add('d:alternative', 'condition' => '', 'eid' => bid)
               end
               branch.attributes.each do |k,v|
                 s2.attributes[k] = v

data/lib/cpee/transformation/dataflow.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with cpee-transformation (file COPYING in the main directory).  If not,
+# along with cpee-transformation (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'target'
@@ -118,6 +118,10 @@ module CPEE
             res
           end #}}}
 
+          def print_Terminate(node,res) #{{{
+            res
+          end #}}}
+
       end
 
     end #}}}

data/lib/cpee/transformation/graphviz.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'structures'

data/lib/cpee/transformation/implementation.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require 'riddl/server'

data/lib/cpee/transformation/implementation.xml

@@ -12,7 +12,7 @@
   for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+  along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
   see <http://www.gnu.org/licenses/>.
 -->
 

data/lib/cpee/transformation/mermaid.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'target'
@@ -56,6 +56,8 @@ module CPEE
             when 'inclusivegateway';  :inclusiveGateway
             when 'endevent';          :endEvent
             when 'startevent';        :startEvent
+            when 'escalate';          :break
+            when 'terminate';         :terminate
 						else
 							nil
 					end
@@ -103,8 +105,8 @@ module CPEE
 							# every line contains a link
 							@graph.add_link Link.new(lid, rid, c.nil? ? nil : c.to_s.gsub(/(^"|"$)/, ''))
 
-              n1 = Node.new(0,lid,map_nodes(ltype),llabel.sub(/^\(/,'').sub(/\)$/,''),0,1)
-              n2 = Node.new(0,rid,map_nodes(rtype),rlabel.sub(/^\(/,'').sub(/\)$/,''),1,0)
+              n1 = Node.new(self.object_id,lid,map_nodes(ltype),llabel.sub(/^\(/,'').sub(/\)$/,''),0,1)
+              n2 = Node.new(self.object_id,rid,map_nodes(rtype),rlabel.sub(/^\(/,'').sub(/\)$/,''),1,0)
 
               @graph.add_node n1, :outgoing
               @graph.add_node n2, :incoming
@@ -136,7 +138,8 @@ module CPEE
         end
 
         def id_find(nid)
-          nid = 'g0' unless nid
+          ### copy, next! would otherwise also change the node id and the entry in @nids
+          nid = nid ? nid.dup : 'g0'
           while @nids.include?(nid)
             nid.next!
           end
@@ -165,13 +168,21 @@ module CPEE
             nid
           end
 
+          ### breaks and terminates all have the same node id, so make them unique
           def print_Break(node,pn)
-            nid = node.id
+            nid = id_find('b1')
             @labels[nid] = "#{nid}:escalate:((^))"
             set_fromto pn, nid
             nid
           end
 
+          def print_Terminate(node,pn)
+            nid = id_find('t1')
+            @labels[nid] = "#{nid}:terminate:((terminate))"
+            set_fromto pn, nid
+            nid
+          end
+
           def print_Parallel(node,pn)
             nid = id_find(node.id)
             set_fromto pn, "#{nid}s"
@@ -190,14 +201,12 @@ module CPEE
             @labels["#{nid}s"] = "#{nid}s:exclusivegateway:{x}"
             @labels["#{nid}e"] = "#{nid}e:exclusivegateway:{x}"
             node.sub.each do |branch|
+              ### branches without condition (incl. otherwise) are plain edges, the reader
+              ### treats the last of them as otherwise
               pn = if branch.condition.any?
                 generate_in_list(branch,["#{nid}s","|\"#{branch.condition.join(' or ')}\"|"])
               else
-                if branch.otherwise
-                  generate_in_list(branch,["#{nid}s","|\"|\"|"])
-                else
-                  generate_in_list(branch,"#{nid}s")
-                end
+                generate_in_list(branch,"#{nid}s")
               end
               set_fromto pn, "#{nid}e"
             end
@@ -211,22 +220,22 @@ module CPEE
             @labels["#{nid}s"] = "#{nid}s:exclusivegateway:{x}"
             @labels["#{nid}e"] = "#{nid}e:exclusivegateway:{x}"
 
+            single = node.sub.length == 1 || (node.sub.length == 2 && node.sub[1].condition.empty? && ((node.sub[1].length == 1 && node.sub[1][0].class.name.gsub(/\w+:+/,'') == 'Break') ||  node.sub[1].length == 0))
+            ### if the conditional over all alternatives decides (break), loop forever
+            cond = !single || node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && ')
+
             cn = if node.mode == :pre_test
               set_fromto "#{nid}s", "#{nid}e"
-              [ ["#{nid}e", "|\"#{node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && ')}\"|"], "#{nid}s"]
+              [ ["#{nid}e", "|\"#{cond}\"|"], "#{nid}s"]
             else
-              set_fromto ["#{nid}e","|\"#{node.sub[0].condition.empty? ? 'true' : node.sub[0].condition.join(' && ')}\"|"], "#{nid}s"
+              set_fromto ["#{nid}e","|\"#{cond}\"|"], "#{nid}s"
               ["#{nid}s", "#{nid}e"]
             end
 
-            pn = if node.sub.length == 2 && node.sub[1].condition.empty? && ((node.sub[1].length == 1 && node.sub[1][0].class.name.gsub(/\w+:+/,'') == 'Break') ||  node.sub[1].length == 0)
+            pn = if single
               generate_in_list(node.sub[0],cn[0])
             else
-              if node.sub.length == 1
-                generate_in_list(node.sub[0],cn[0])
-              else
-                print_Conditional(node,cn[0])
-              end
+              print_Conditional(node,cn[0])
             end
             set_fromto pn, cn[1]
 

data/lib/cpee/transformation/ptml.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'target'
@@ -173,6 +173,13 @@ module CPEE
             res
           end
 
+          def print_Terminate(node,res)
+            rid = rand.to_s[2..11]
+            n = res.add('manualTask','id' => rid, 'name' => node.label)
+            set_edges(@last,rid,res)
+            res
+          end
+
           def print_Loop(node,res)
             if node.mode == :pre_test
               original_last = @last

data/lib/cpee/transformation/structures.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 module CPEE
@@ -86,6 +86,11 @@ module CPEE
         super context, '-1', :break, 'BREAK', 1, []
       end
     end #}}}
+    class Terminate < Node #{{{
+      def initialize(context)
+        super context, '-2', :terminate, 'TERMINATE', 1, []
+      end
+    end #}}}
 
     class Alternative < Array #{{{
       include Container
@@ -252,12 +257,17 @@ module CPEE
       def link(f,t)
         @links.find{ |x| x.from == f && x.to == t }
       end
+      def links_from(f)
+        @links.find_all{ |x| x.from == f }
+      end
 
       def add_link(l)
         @links << l
       end
 
       def next_nodes(from)
+        ### a terminate ends the process, nothing follows
+        return [] if from&.type == :terminate
         links = @links.find_all { |x| x.from == from.id }
         links.map{|x| @nodes[x.to] }
       end
@@ -287,7 +297,7 @@ module CPEE
             cname = e.class.to_s.gsub(/[^:]*::/,'')
             ret << indent + pchar + ' ' + cname + " #{cname == 'Alternative' ?  e.condition : ''}\n"
             ret << print_tree(e,indent + (last ? '  ' : '│ '),verbose)
-          elsif e.is_a?(Break)
+          elsif e.is_a?(Break) || e.is_a?(Terminate)
             ret << indent + pchar + ' ' + e.class.to_s.gsub(/[^:]*::/,'') + "\n"
           else
             ret << indent + pchar + ' ' + e.niceid.to_s + (verbose ? " (#{e.label})" : "") + "\n"
@@ -408,13 +418,18 @@ module CPEE
         end
 
         def add_breaks(context,front=true)
-          trueloops = self.find_all{ |t| t.last == t.first }.length
+          ### traces that are a prefix of another trace were cut short at an earlier
+          ### visited node, they do not leave the loop, so they get no break
+          self.delete_if{ |t| self.any?{ |o| o.length > t.length && o[0...t.length] == t } }
+          ### a trace whose last node occurs earlier in it is a loop (to the head or to
+          ### an inner loop), not a way out. a trace ending in terminate needs no break
+          trueloops = self.find_all{ |t| t[0..-2].include?(t.last) || t.last&.type == :terminate }.length
           tb = Break.new(context)
           if trueloops == self.length
             self << (front ? [nil,tb] : [tb,nil])
           else
             self.each do |t|
-              t << tb unless t.last == t.first ### an explicit break
+              t << tb unless t[0..-2].include?(t.last) || t.last&.type == :terminate ### an explicit break
             end
           end
         end

data/lib/cpee/transformation/target.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 module CPEE

data/lib/cpee/transformation/text-bf.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require File.expand_path(File.dirname(__FILE__) + '/target')
@@ -83,6 +83,11 @@ module CPEE
             [nil]
           end
 
+          def print_Terminate(node,res)
+            res << get_next("at this point the process is terminated. ")
+            [nil]
+          end
+
           def print_Loop(node,res)
             post = []
 

data/lib/cpee/transformation/text-df-PO-extended.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require File.expand_path(File.dirname(__FILE__) + '/target')
@@ -98,6 +98,11 @@ module CPEE
             res
           end
 
+          def print_Terminate(node,res)
+            res << "At this point the process is terminated. "
+            res
+          end
+
           def print_Loop(node,res)
             @loop ||= 0
             @loop += 1

data/lib/cpee/transformation/text-df-PO-reduced.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require File.expand_path(File.dirname(__FILE__) + '/target')
@@ -98,6 +98,11 @@ module CPEE
             res
           end
 
+          def print_Terminate(node,res)
+            res << "At this point the process is terminated. "
+            res
+          end
+
           def print_Loop(node,res)
             logic = Proc.new do
               if node.mode == :pre_test

data/lib/cpee/transformation/transformer.rb

@@ -13,7 +13,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory). If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory). If not,
 # see <http://www.gnu.org/licenses/>.
 
 require_relative 'structures'
@@ -83,6 +83,8 @@ module CPEE
             flat ? nil : Conditional.new(node.id,:inclusive,node.type,node.label)
           when :break
             flat ? Break.new(node.id) : Break.new(node.id)
+          when :terminate
+            Terminate.new(node.id)
           when :endEvent, :startEvent, nil
             nil
           else
@@ -113,7 +115,10 @@ module CPEE
               else
                 ### if traces.all_tail? && traces.length > 1 && !traces.all_loops?
                 ### we had traces.all_tail? here. why?
-                if !traces.all_tail? && traces.length > 1 && !traces.all_loops?
+                ### a direct link from the branch (e.g. loop gateway) to the first node wins
+                if (dl = @source.graph.link(branch.id,traces.first_node.id))
+                  dl
+                elsif !traces.all_tail? && traces.length > 1 && !traces.all_loops?
                   @source.graph.link(traces.first[-2].id,traces.first[-1].id)
                 else
                   @source.graph.link(branch.id,traces.first_node.id)
@@ -156,6 +161,8 @@ module CPEE
                 ### at the output time it is decided wether this can be optimized
                 branch << Loop.new(node.id)
                 branch.last.mode = :post_test if loops.all_tail?
+                ### there is no way out, so add a default otherwise with a break
+                loops.add_breaks(self.object_id,node.type == :exclusiveGateway)
                 ### remove the exclusive gateway because we no longer need it
                 ### if there is non (tail controlled, remove the loop target (last)
                 if node.type == :exclusiveGateway
@@ -267,6 +274,17 @@ module CPEE
                 puts '--> ebranch down to ' + (down + 1).to_s if debug
                 build_ttree nb, trcs, endnode, debug, down + 1
                 puts '--> ebranch up from ' + (down + 1).to_s if debug
+              else
+                ### empty branch (e.g. loops straight back), its target is already gone
+                ### so use the only gateway link that no other branch starts with
+                used = tracesgroup.reject{ |t| t.finished? }.map{ |t| t.first_node&.id }
+                lis = @source.graph.links_from(nb.id).reject{ |l| used.include?(l.to) }
+                if lis.length == 1 && nb.condition?
+                  li = lis.first
+                  nb.condition << li.condition if !li.condition.nil? && !li.condition&.strip&.empty?
+                  nb.otherwise = li.otherwise if li.condition.nil?
+                  nb.condition_type = "text/x-ruby"
+                end
               end
             end
             # remove all traces that don't start with endnode to account for loops

data/tools/bpmn2_to_cpee.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/bpmn2_to_mermaid.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/bpmn2_to_ptml.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_cpee.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_dataflow.rb

@@ -12,7 +12,7 @@
 # PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License along with
-# cpee-transformation (file COPYING in the main directory).  If not, see
+# cpee-transformation (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_mermaid.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_ptml.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_text_bf.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_text_df-poe.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/cpee_to_text_df-por.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/mermaid_to_cpee.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

data/tools/ptml_to_cpee.rb

@@ -14,7 +14,7 @@
 # for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with CPEE-TRANSFORMATION (file COPYING in the main directory).  If not,
+# along with CPEE-TRANSFORMATION (file LICENSE in the main directory).  If not,
 # see <http://www.gnu.org/licenses/>.
 
 def wrap(s1, s2, width=78, indent=ARGV.options.summary_width + 3)

metadata

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