cpee 2.1.92 → 2.1.95

data/cockpit/templates/Coopis 2010.xml

@@ -22,15 +22,15 @@
     <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
   <attributes>
+    <guarded>none</guarded>
+    <modeltype>CPEE</modeltype>
     <theme>extended</theme>
+    <guarded_id/>
     <info>Coopis 2010</info>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
-    <modeltype>CPEE</modeltype>
     <design_stage>development</design_stage>
-    <guarded>none</guarded>
-    <design_dir>Experiments.dir/Twin Engine.dir</design_dir>
-    <guarded_id/>
+    <design_dir>Templates.dir</design_dir>
     <model_uuid>a1cbb855-90e3-4d8c-b44b-d3ba7bff9f4e</model_uuid>
     <model_version/>
     <replay>https://cpee.org/replay/</replay>
@@ -194,4 +194,11 @@ data.costs += result.value('costs').to_f</finalize>
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
+  <subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+    <subscription id="_matze" url="https://lehre.bpm.in.tum.de/~mangler/a.php">
+      <topic id="state">
+        <event>change</event>
+      </topic>
+    </subscription>
+  </subscriptions>
 </testset>

data/cockpit/templates/Frames.xml

@@ -1,35 +1,33 @@
 <?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements/>
+  <dataelements>
+    <res>{"select_0":"learned in class or from book","input_0":"sadff","select_1":"used on a class project","input_1":"asdfsaf","input_2":"sadfasdf"}</res>
+  </dataelements>
   <endpoints>
-    <timeout>https://cpee.org/services/timeout.php</timeout>
-    <subprocess>https://cpee.org/flow/start/url/</subprocess>
-    <frames_init>https-post://cpee.org/out/frames/simple/</frames_init>
-    <send>https-post://cpee.org/ing/correlators/message/send/</send>
-    <frames_display>https-put://cpee.org/out/frames/simple/</frames_display>
-    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
-    <user>https-post://cpee.org/services/timeout-user.php</user>
-    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
+    <frames_init>https-post://cpee.org/out/frames/</frames_init>
+    <frames_display>https-put://cpee.org/out/frames/</frames_display>
   </endpoints>
   <attributes>
+    <guarded>none</guarded>
+    <modeltype>CPEE</modeltype>
+    <theme>extended</theme>
+    <guarded_id/>
     <info>Frames</info>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
-    <modeltype>CPEE</modeltype>
-    <guarded>none</guarded>
-    <guarded_id/>
     <model_uuid>5ed82f61-a382-49b5-a420-c63e01d5a9f5</model_uuid>
     <model_version/>
-    <theme>extended</theme>
     <design_dir>Templates.dir</design_dir>
     <design_stage>development</design_stage>
+    <fid>gnd</fid>
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="frames_init">
         <parameters>
           <label>"Init Frame"</label>
+          <color/>
           <arguments>
             <style_url>https://cpee.org/form/frames.css</style_url>
             <document_url/>
@@ -39,19 +37,30 @@
             <document_name>Show Info</document_name>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_init += attributes.fid</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -62,11 +71,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a3" endpoint="frames_display">
         <parameters>
           <label>Clear </label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>0</lx>
@@ -79,19 +92,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -102,11 +126,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a6" endpoint="frames_display">
         <parameters>
           <label>Show Header</label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>0</lx>
@@ -124,19 +152,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -147,11 +186,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a5" endpoint="frames_display">
         <parameters>
           <label>Display Graph</label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>3</lx>
@@ -169,19 +212,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -192,6 +246,9 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <loop mode="post_test" condition="true">
@@ -203,6 +260,7 @@
         <call id="a2" endpoint="frames_display">
           <parameters>
             <label>Show Button</label>
+            <color/>
             <arguments>
               <type>wait</type>
               <lx>0</lx>
@@ -220,19 +278,98 @@
               <default/>
             </arguments>
           </parameters>
+          <code>
+            <signal/>
+            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <finalize output="result"/>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
+          <annotations>
+            <_generic/>
+            <_timing>
+              <_timing_weight/>
+              <_timing_avg/>
+              <explanations/>
+            </_timing>
+            <_shifting>
+              <_shifting_type>Duration</_shifting_type>
+            </_shifting>
+            <_context_data_analysis>
+              <probes/>
+              <ips/>
+            </_context_data_analysis>
+            <report>
+              <url/>
+            </report>
+            <_notes>
+              <_notes_general/>
+            </_notes>
+          </annotations>
+          <documentation>
+            <input/>
+            <output/>
+            <implementation>
+              <description/>
+            </implementation>
+            <code>
+              <description/>
+            </code>
+          </documentation>
+        </call>
+        <call id="a8" endpoint="frames_display">
+          <parameters>
+            <label>Experience</label>
+            <color/>
+            <arguments>
+              <type>wait</type>
+              <lx>0</lx>
+              <ly>1</ly>
+              <x_amount>5</x_amount>
+              <y_amount>9</y_amount>
+              <button/>
+              <style/>
+              <urls>
+                <urls_item>
+                  <lang>de-at</lang>
+                  <url>https://cpee.org/quests/dataflow/questions.html</url>
+                </urls_item>
+              </urls>
+              <default>
+                <text_0>Please rate your **programming** experience with respect to the following 5-point levels:</text_0>
+                <select_0>no experience; learned in class or from book; used on a class project; used on one project in industry; used on multiple projects in industry</select_0>
+                <input_0>How many years of programming experience do you have?</input_0>
+                <text_1>Please rate your **modelling** experience with respect to the following 5-point levels:</text_1>
+                <select_1>no experience; learned in class or from book; used on a class project; used on one project in industry; used on multiple projects in industry</select_1>
+                <input_1>How many years of modelling experience do you have?</input_1>
+                <input_2>Which graphical modeling languages are you familiar with (e.g., UML, ER, etc.)?</input_2>
+              </default>
+            </arguments>
+          </parameters>
+          <code>
+            <signal/>
+            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <finalize output="result">data.res = result</finalize>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
           <annotations>
+            <_generic/>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
-              <_context_data_analysis>
-                <probes/>
-                <ips/>
-              </_context_data_analysis>
-              <report>
-                <url/>
-              </report>
               <explanations/>
             </_timing>
+            <_shifting>
+              <_shifting_type>Duration</_shifting_type>
+            </_shifting>
+            <_context_data_analysis>
+              <probes/>
+              <ips/>
+            </_context_data_analysis>
+            <report>
+              <url/>
+            </report>
             <_notes>
               <_notes_general/>
             </_notes>
@@ -243,11 +380,15 @@
             <implementation>
               <description/>
             </implementation>
+            <code>
+              <description/>
+            </code>
           </documentation>
         </call>
         <call id="a7" endpoint="frames_display">
           <parameters>
             <label>Clear Button</label>
+            <color/>
             <arguments>
               <type>set</type>
               <lx>0</lx>
@@ -260,19 +401,30 @@
               <default/>
             </arguments>
           </parameters>
+          <code>
+            <signal/>
+            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <finalize output="result"/>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
           <annotations>
+            <_generic/>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
-              <_context_data_analysis>
-                <probes/>
-                <ips/>
-              </_context_data_analysis>
-              <report>
-                <url/>
-              </report>
               <explanations/>
             </_timing>
+            <_shifting>
+              <_shifting_type>Duration</_shifting_type>
+            </_shifting>
+            <_context_data_analysis>
+              <probes/>
+              <ips/>
+            </_context_data_analysis>
+            <report>
+              <url/>
+            </report>
             <_notes>
               <_notes_general/>
             </_notes>
@@ -283,6 +435,9 @@
             <implementation>
               <description/>
             </implementation>
+            <code>
+              <description/>
+            </code>
           </documentation>
         </call>
         <stop id="a4"/>

data/cockpit/templates/Track Test.xml

@@ -21,7 +21,7 @@
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <loop mode="pre_test" condition="true">
-        <parallel wait="-1">
+        <parallel wait="-1" cancel="last">
           <loop mode="pre_test" condition="data.i &lt; 4">
             <_probability>
               <_probability_min/>

data/cockpit/themes/base.js

@@ -117,7 +117,7 @@ function WFAdaptorManifestationBase(adaptor) {
       nodes.reverse();
       var iconm = contextMenuHandling_clean_icon(self.resources['arrow']);
       var iconc = contextMenuHandling_clean_icon(self.resources['arrow']);
-      iconm.children('.rfill').addClass('menu');
+      iconm.children('.colorstyle').css('fill','var(--wfadaptor-important');
       if (myid == localStorage.getItem('marked_from')) {
         menu.push(
           {
@@ -186,8 +186,7 @@ function WFAdaptorManifestationBase(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon = contextMenuHandling_clean_icon(self.elements[xml_node.get(0).tagName].illustrator.svg);
-      icon.find('.rfill').addClass('menu');
-      icon.find('.hfill').addClass('menu');
+      icon.find('.colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'] = [{
         'label': 'Remove Element',
         'function_call': function(selector,target,selected){
@@ -204,7 +203,7 @@ function WFAdaptorManifestationBase(adaptor) {
       nodes = JSON.parse(nodes);
       if (nodes && nodes.length > 0) {
         var icond = contextMenuHandling_clean_icon(self.resources['delete']);
-        icond.children('.standfat').addClass('menu');
+        icond.find('.colorstyle').css('stroke','var(--wfadaptor-important)');
         menu['Delete'].push({
           'label': 'Remove Marked Elements',
           'function_call': function(){
@@ -236,7 +235,7 @@ function WFAdaptorManifestationBase(adaptor) {
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon = contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg);
-      icon.children('.rfill:last').addClass('menu');
+      icon.find('.part-extra .colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'].push({
         'label': 'Remove Scripts',
         'function_call': self.adaptor.description.remove,
@@ -247,7 +246,7 @@ function WFAdaptorManifestationBase(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon = contextMenuHandling_clean_icon(self.elements.call.illustrator.svg);
-      icon.children('g.replace').addClass('passive');
+      icon.find('.part-normal').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -352,7 +351,7 @@ function WFAdaptorManifestationBase(adaptor) {
     $('.resource-row[element-row=' + er + '] .resource-point').each((_,e) => {
       let pos = e.getBoundingClientRect();
       let text = $('text',e).text();
-      show_label(pos.x + 12, pos.y + 5, 60, text);
+      show_dataflow_label(pos.x + 12, pos.y + 5, 60, text);
     })
     self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','block');
     self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').addClass('hover');
@@ -387,6 +386,8 @@ function WFAdaptorManifestationBase(adaptor) {
         let col = $('> parameters > color', node);
         if (col.length > 0 && col.text() != '') {
           sty['fill'] = col.text();
+          // sty['fill'] = "url(#custom-gradient)";
+          // sty['--custom-color'] = col.text();
         }
         return sty;
       },
@@ -1337,8 +1338,8 @@ function WFAdaptorManifestationBase(adaptor) {
         let alist = []
         let plist = []
 
-        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
-        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        var regassi =      /data\.([a-z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-z_][a-zA-Z0-9_]*)\s*/g;
 
         $('call, manipulate, loop[condition], alternative[condition]',node).each(function(i,n) {
           let item = '';
@@ -1351,16 +1352,18 @@ function WFAdaptorManifestationBase(adaptor) {
             if (n.nodeName == 'manipulate') { // css selector can not directly access manipulate
               item += n.textContent + '\n';
             }
-            $('call > parameters > arguments > *, call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
+            $('call > parameters > arguments *',n).each(function(j,m){
+              let x = m.textContent;
+              if (x.charAt(0) == '!') { item += x + '\n'; }
+            });
+            $('call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
               let x = m.textContent;
-              if (m.parentNode.nodeName == 'arguments' && x.charAt(0) != '!' ) { return }
               item += x + '\n';
             });
           }
           if (item == '') { return; }
 
           let indices = [];
-
           for (const match of item.matchAll(regassi)) {
             indices.push(match.index);
             alist.push(match[1]);
@@ -1370,7 +1373,7 @@ function WFAdaptorManifestationBase(adaptor) {
             const arg1 = match[1];
             if (indices.includes(match.index)) { continue; }
             if (!alist.includes(arg1)) {
-              if (match.index >= indices[0] || indices.length == 0) {
+              if (indices.length == 0 || match.index < indices[0]) {
                 plist.push(arg1);
               }
             }

data/cockpit/themes/control/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -51,6 +52,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/control/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">
@@ -43,7 +44,7 @@
     </element>
   </element>
   <element name="code" rngui:header="Data Handling">
-    <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
+    <element name="signal" rngui:label="Signal after finalize/update">
       <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
     </element>
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -77,6 +78,14 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+      <element name="_include" rngui:label="Include nested events">
+        <data type="boolean" rngui:label="Include nested events"/>
+      </element>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>

data/cockpit/themes/control/rngs/loop.rng

@@ -19,4 +19,11 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_iteration" rngui:label="Log per iteration">
+        <data type="boolean" rngui:label="Log per iteration"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/control/rngs/manipulate.rng

@@ -16,7 +16,15 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>
+  <element name="_annotations" rngui:header="Annotations">
+    <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
+      <element name="_exclude" rngui:label="Exclude from log">
+        <data type="boolean" rngui:label="Exclude from log"/>
+      </element>
+    </element>
+  </element>
 </element>

data/cockpit/themes/control/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">