cpee 1.5.24 → 1.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c202a4a42d4e886fa9899514f6e4490943276739bc9ca61196f2e8c5a407ef3f
-  data.tar.gz: 3b07b85f227d87aef3ffd78a5afd2b975f20cc7ebf15bf8ca416f5443e2e0de8
+  metadata.gz: 37efc8a4ee5d0180cb006297e5948408f7c1772b9f8fc2a87d1612b7d59caf06
+  data.tar.gz: 77d0bec7010653f12b05ef43a1f585c3207fe45a07fddb28c3fb6f4e411a107e
 SHA512:
-  metadata.gz: 39bc0af5d72254412377b210c14aa1b8929b40cd74be68f442e6aa0184fbaf89fed360433a47d1458ce3a6feef721b30e931007dc3db58006d85a2930e32d5f1
-  data.tar.gz: 3a1eb0511449d32b1d275d0a5648d194a252b09d371e2d619b78d9e9753c5c744c33cd44015c807382107873e5f48a537a371fa0a0e83f869abdad892d0b69ca
+  metadata.gz: 6c3985ee99ff71092829163a58fed998a6095df1c34bd50d9172d607894ff43ff7e47de0c0ceceab0cf67ee8eefb9d1b67973f3bec3ccd6019fc67e2a84ff3cb
+  data.tar.gz: 879610b214fbd73ba364936ee83f75a63921d058966ba37e5308b44e8f164cf4029afbe0211c0a01aa322a6fa96ce3518b03971345c814809ecc91f70934f946

data/cockpit/index.html

@@ -112,7 +112,7 @@
 
     <div class='hidden' id='relaxngworker'></div>
 
-    <div class='menu' id='predefinedtestsets'></div>
+    <div class='menu' id='templates'></div>
     <div class='menu' id='modeltypes'></div>
 
     <ui-tabbed id="instance">
@@ -149,7 +149,7 @@
               <form id='fuckchrome'>
                 <input type='file' name='testsetfile' id='testsetfile'/>
               </form>
-              <button title='a testset includes various settings, subscriptions and a model' name="loadtestset">load predefined testset</button><button title='a testset includes various settings, subscriptions and a model' name="loadtestsetfile">load testset file</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="loadtestset">load template</button><button title='a testset includes various settings, subscriptions and a model' name="loadtestsetfile">load testset</button>
             </div>
             <div>
               <input type='file' name='modelfile' id='modelfile'/>

data/cockpit/js/instance.js

@@ -71,7 +71,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
 function cockpit() { //{{{
   $("button[name=base]").click(function(){ create_instance($("input[name=base-url]").val(),null,false,false); });
   $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
-  $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),function(){ load_testset(false) } ); });
+  $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#templates'),function(){ load_testset(false) } ); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
@@ -91,7 +91,7 @@ function cockpit() { //{{{
     success: function(res){
       $('testset',res).each(function(){
         var ts = $(this).text();
-        $('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
+        $('#templates').append($("<div class='menuitem'></div>").text(ts));
       });
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
@@ -102,7 +102,7 @@ function cockpit() { //{{{
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
@@ -112,7 +112,7 @@ function cockpit() { //{{{
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
@@ -135,7 +135,7 @@ function cockpit() { //{{{
         if (q.exec.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
         } else {
-          $("#predefinedtestsets div.menuitem").each(function(k,v){
+          $("#templates div.menuitem").each(function(k,v){
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
           });
         }
@@ -1001,7 +1001,7 @@ function load_testset(exec) {// {{{
   if (loading) return;
   loading = true;
 
-  var name = $("#predefinedtestsets div.menuitem[data-selected=selected]").text();
+  var name = $("#templates div.menuitem[data-selected=selected]").text();
   var url;
   if (name) {
     url = $('body').attr('current-testsets') + name + ".xml";

data/cockpit/rngs/attributes.rng

@@ -1,8 +1,8 @@
 <element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Attributes">
-    <element rngui:label='Name'>
+    <element rngui:label='name'>
       <anyName/>
-      <data type="string" rngui:label="Value"/>
+      <data type="string" rngui:label="value"/>
     </element>
   </zeroOrMore>
 </element>

data/cockpit/rngs/dataelements.rng

@@ -1,8 +1,8 @@
 <element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Data Element">
-    <element rngui:label='Name'>
+    <element rngui:label='name'>
       <anyName/>
-      <data type="string" rngui:label="Value"/>
+      <data type="string" rngui:label="value"/>
     </element>
   </zeroOrMore>
 </element>

data/cockpit/rngs/endpoints.rng

@@ -1,8 +1,8 @@
 <element rngui:version="1.2" name="value" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
   <zeroOrMore rngui:label="Create Endpoint">
-    <element rngui:label='Name'>
+    <element rngui:label='name'>
       <anyName/>
-      <data type="string" rngui:label="Value"/>
+      <data type="string" rngui:label="value"/>
     </element>
   </zeroOrMore>
 </element>

data/cockpit/templates/BPM 2020 Manual Adjust.xml

@@ -0,0 +1,235 @@
+<testset>
+  <dataelements/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
+    <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
+    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
+    <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
+    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
+    <move_rel xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/relative</move_rel>
+  </endpoints>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a6" endpoint="get_offset_base">
+        <parameters>
+          <label>Get first offset</label>
+          <arguments/>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">data.direction_first = result
+data.direction_first['x'] = data.direction_first['dir_x'] * 10
+data.direction_first['y'] = data.direction_first['dir_y'] * 10</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a10" endpoint="move_rel">
+        <parameters>
+          <label>Move closer</label>
+          <arguments>
+            <x>!data.direction_first['x']</x>
+            <y>!data.direction_first['y']</y>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a15" endpoint="wait">
+        <parameters>
+          <label>Wait for camera stream delay</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>5</timeout>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a17" endpoint="get_offset_base">
+        <parameters>
+          <label>Get second offset and calc distance</label>
+          <arguments/>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">data.direction_second = result
+if (data.direction_first['dir_x'] * data.direction_second['dir_x'] &gt;= 0)
+  data.traveled = data.direction_first['len'] - data.direction_second['len']
+else
+  data.traveled = data.direction_first['len'] + data.direction_second['len']
+end
+data.len = data.direction_second['len'] / (data.traveled / 10)
+data.direction_second['x'] = data.direction_second['dir_x'] * data.len
+data.direction_second['y'] = data.direction_second['dir_y'] * data.len</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a12" endpoint="move_rel">
+        <parameters>
+          <label>Move closer</label>
+          <arguments>
+            <x>!data.direction_second['x']</x>
+            <y>!data.direction_second['y']</y>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a16" endpoint="wait">
+        <parameters>
+          <label>Wait for camera stream delay</label>
+          <method>:post</method>
+          <arguments>
+            <timeout>5</timeout>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <call id="a2" endpoint="get_offset_base">
+        <parameters>
+          <label>Investigate Precision</label>
+          <arguments/>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+        </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">data.direction_third = result</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+      <manipulate id="a11" label="Calculate new position">data.item = {}
+data.item['adjust_x'] = (data.direction_first['x'] + data.direction_second['x']).round(0)
+data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y']).round(0)</manipulate>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Manual Adjust</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
+    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
+  </attributes>
+</testset>

data/cockpit/templates/BPM 2020 Solution Baseline.xml

@@ -0,0 +1,250 @@
+<testset>
+  <dataelements>
+    <places xmlns="http://riddl.org/ns/common-patterns/properties/1.0">[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2]]</places>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
+    <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
+    <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
+    <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
+    <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
+    <subprocess xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9296/url/</subprocess>
+  </endpoints>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="data.places.length &gt; 0">
+        <_probability>
+          <_probability_min/>
+          <_probability_max/>
+          <_probability_avg/>
+        </_probability>
+        <call id="a1" endpoint="overview">
+          <parameters>
+            <label>Move to overview position</label>
+            <arguments/>
+            <stream>
+              <sensors/>
+              <aggregators/>
+              <costs/>
+            </stream>
+          </parameters>
+          <annotations>
+            <_timing>
+              <_timing_wait/>
+              <_timing_threshold/>
+              <_timing_min/>
+              <_timing_max/>
+              <_timing_avg/>
+            </_timing>
+            <_notes>
+              <_notes_general/>
+            </_notes>
+          </annotations>
+        </call>
+        <call id="a7" endpoint="wait">
+          <parameters>
+            <label>Wait for camera stream delay</label>
+            <method>:post</method>
+            <arguments>
+              <timeout>5</timeout>
+            </arguments>
+            <stream>
+              <sensors/>
+              <aggregators/>
+              <costs/>
+            </stream>
+          </parameters>
+          <annotations>
+            <_timing>
+              <_timing_wait/>
+              <_timing_threshold/>
+              <_timing_min/>
+              <_timing_max/>
+              <_timing_avg/>
+            </_timing>
+            <_notes>
+              <_notes_general/>
+            </_notes>
+          </annotations>
+        </call>
+        <call id="a3" endpoint="get_items_base">
+          <parameters>
+            <label>Get item positions</label>
+            <arguments/>
+            <stream>
+              <sensors/>
+              <aggregators/>
+              <costs/>
+            </stream>
+          </parameters>
+          <code>
+            <prepare/>
+            <finalize output="result">data.items = result</finalize>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
+          <annotations>
+            <_timing>
+              <_timing_wait/>
+              <_timing_threshold/>
+              <_timing_min/>
+              <_timing_max/>
+              <_timing_avg/>
+            </_timing>
+            <_notes>
+              <_notes_general/>
+            </_notes>
+          </annotations>
+        </call>
+        <choose mode="exclusive">
+          <alternative condition="data.items.length &gt; 0">
+            <call id="a5" endpoint="move_camera">
+              <parameters>
+                <label>Inspect first item</label>
+                <arguments>
+                  <x>!data.items.first['x']</x>
+                  <y>!data.items.first['y']</y>
+                </arguments>
+                <stream>
+                  <sensors/>
+                  <aggregators/>
+                  <costs/>
+                </stream>
+              </parameters>
+              <annotations>
+                <_timing>
+                  <_timing_wait/>
+                  <_timing_threshold/>
+                  <_timing_min/>
+                  <_timing_max/>
+                  <_timing_avg/>
+                </_timing>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+            </call>
+            <call id="a15" endpoint="wait">
+              <parameters>
+                <label>Wait for camera stream delay</label>
+                <method>:post</method>
+                <arguments>
+                  <timeout>5</timeout>
+                </arguments>
+                <stream>
+                  <sensors/>
+                  <aggregators/>
+                  <costs/>
+                </stream>
+              </parameters>
+              <annotations>
+                <_timing>
+                  <_timing_wait/>
+                  <_timing_threshold/>
+                  <_timing_min/>
+                  <_timing_max/>
+                  <_timing_avg/>
+                </_timing>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+            </call>
+            <call id="a2" endpoint="subprocess">
+              <parameters>
+                <label>Adjust</label>
+                <method>:post</method>
+                <arguments>
+                  <behavior>wait_running</behavior>
+                  <url>http://cpee.org/~demo/cpee-cockpit/templates/BPM%202020%20Manual%20Adjust.xml</url>
+                  <init/>
+                  <endpoints/>
+                  <stream/>
+                </arguments>
+                <stream>
+                  <sensors/>
+                  <aggregators/>
+                  <costs/>
+                </stream>
+              </parameters>
+              <code>
+                <prepare/>
+                <finalize output="result"># data.place = data.places.shift
+data.item = result['item']
+data.item['x'] = data.items.first['x'] + data.item['adjust_x']
+data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
+                <update output="result"/>
+                <rescue output="result"/>
+              </code>
+              <annotations>
+                <_timing>
+                  <_timing_wait/>
+                  <_timing_threshold/>
+                  <_timing_min/>
+                  <_timing_max/>
+                  <_timing_avg/>
+                </_timing>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+            </call>
+            <stop id="a4"/>
+            <call id="a8" endpoint="grip_and_place">
+              <parameters>
+                <label>Grip and Place</label>
+                <arguments>
+                  <x>!data.item['x']</x>
+                  <y>!data.item['y']</y>
+                  <place_x>!data.place[0]</place_x>
+                  <place_y>!data.place[1]</place_y>
+                </arguments>
+                <stream>
+                  <sensors/>
+                  <aggregators/>
+                  <costs/>
+                </stream>
+              </parameters>
+              <annotations>
+                <_timing>
+                  <_timing_wait/>
+                  <_timing_threshold/>
+                  <_timing_min/>
+                  <_timing_max/>
+                  <_timing_avg/>
+                </_timing>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+            </call>
+            <_probability>
+              <_probability_min/>
+              <_probability_max/>
+              <_probability_avg/>
+            </_probability>
+          </alternative>
+          <otherwise>
+            <terminate/>
+          </otherwise>
+        </choose>
+      </loop>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Solution Baseline Manual Adjust</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
+    <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
+  </attributes>
+</testset>