cpee 2.0.8 → 2.0.15

data/cockpit/templates/Track Test.xml

@@ -0,0 +1,82 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
+    <i>0</i>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <start_url>https://cpee.org/flow/start/url/</start_url>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="true">
+        <parallel wait="-1">
+          <loop mode="pre_test" condition="data.i &lt; 4">
+            <_probability>
+              <_probability_min/>
+              <_probability_max/>
+              <_probability_avg/>
+            </_probability>
+            <parallel_branch pass="" local="">
+              <call id="a1" endpoint="start_url">
+                <parameters>
+                  <label>Start</label>
+                  <method>:post</method>
+                  <arguments>
+                    <behavior>wait_running</behavior>
+                    <url>https://cpee.org/flow/templates/instantiate/Take_Sub.xml</url>
+                    <init>
+                      <time>4</time>
+                    </init>
+                    <endpoints/>
+                    <stream/>
+                  </arguments>
+                  <stream>
+                    <sensors/>
+                    <aggregators/>
+                    <costs/>
+                  </stream>
+                  <report>
+                    <url/>
+                  </report>
+                </parameters>
+                <annotations>
+                  <_timing>
+                    <_timing_wait/>
+                    <_timing_threshold/>
+                    <_timing_min/>
+                    <_timing_max/>
+                    <_timing_avg/>
+                  </_timing>
+                  <_notes>
+                    <_notes_general/>
+                  </_notes>
+                </annotations>
+              </call>
+            </parallel_branch>
+            <manipulate id="a4" label="">data.i += 1</manipulate>
+          </loop>
+        </parallel>
+        <manipulate id="a3" label="">data.i = 0</manipulate>
+        <_probability>
+          <_probability_min/>
+          <_probability_max/>
+          <_probability_avg/>
+        </_probability>
+        <stop id="a2"/>
+      </loop>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info>Track Test</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>

data/cockpit/templates/{BPM 2020 Manual Adjust.xml → UR-VUE 2020 Manual Adjust.xml }

@@ -174,7 +174,7 @@ data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y'])
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Manual Adjust</info>
+    <info>UR-VUE 2020 Manual Adjust</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution Baseline.xml → UR-VUE 2020 Solution Baseline.xml }

@@ -3,6 +3,13 @@
     <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
   </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
   <endpoints>
     <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
     <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
@@ -12,7 +19,7 @@
     <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
     <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
     <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
-    <subprocess>http://localhost:9296/url/</subprocess>
+    <subprocess>https://cpee.org/flow/start/url/</subprocess>
   </endpoints>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -108,7 +115,7 @@
                 <method>:post</method>
                 <arguments>
                   <behavior>wait_running</behavior>
-                  <url>http://localhost/flow/templates/BPM%202020%20Manual%20Adjust.xml</url>
+                  <url>https://cpee.org/flow/templates/UR-VUE%202020%20Manual%20Adjust.xml</url>
                   <init/>
                   <endpoints/>
                   <stream/>
@@ -188,7 +195,7 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution Baseline</info>
+    <info>UR-VUE 2020 Solution Baseline</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution NN.xml → UR-VUE 2020 Solution NN.xml }

@@ -189,7 +189,7 @@ data.item = result[0]</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution NN</info>
+    <info>UR-VUE 2020 Solution NN</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/{BPM 2020 Solution View.xml → UR-VUE 2020 Solution View.xml }

@@ -1,6 +1,13 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements/>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
   <endpoints>
     <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
     <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
@@ -136,7 +143,7 @@ data.item = result[0]</finalize>
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info>BPM 2020 Solution View</info>
+    <info>UR-VUE 2020 Solution View</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
     <resource>ur51</resource>

data/cockpit/templates/UR-VUE 2020.xml

@@ -0,0 +1,26 @@
+<testset>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <handlers>
+    <handler url="http://tango.wst.univie.ac.at:9332">
+      <votes topic='state'>change</votes>
+      <events topic='state'>change</events>
+      <events topic='task'>instantiation</events>
+    </handler>
+  </handlers>
+  <endpoints>
+    <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
+    <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
+    <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
+    <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
+    <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
+    <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
+    <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
+    <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
+    <subprocess>https://cpee.org/flow/start/url/</subprocess>
+    <wait>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
+    <adjust>http://cpee.org/~demo/cpee-cockpit/templates/UR-VUE%202020%20Manual%20Adjust.xml</adjust>
+  </endpoints>
+  <attributes>
+    <resource>ur51</resource>
+  </attributes>
+</testset>

data/cockpit/templates/instantiate.local/Take_Sub.xml

@@ -0,0 +1,59 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
+    <time>5</time>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <start_url>http://localhost:9296/url/</start_url>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="start_url">
+        <parameters>
+          <label>Start</label>
+          <method>:post</method>
+          <arguments>
+            <behavior>wait_running</behavior>
+            <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url
+            <init/>
+            <endpoints/>
+            <stream/>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+          <report>
+            <url/>
+          </report>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>

data/cockpit/templates/instantiate/Take_Perf.xml

@@ -0,0 +1,46 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
+    <time>5</time>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <fetch>https://cpee.org/perf</fetch>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="fetch">
+        <parameters>
+          <label/>
+          <method>:get</method>
+          <arguments/>
+        </parameters>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_attachments/>
+        </_notes>
+        <code>
+          <finalize output="result"/>
+          <update output="result"/>
+        </code>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>

data/cockpit/templates/instantiate/Take_Sub.xml

@@ -0,0 +1,58 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <start_url>https://cpee.org/flow/start/url/</start_url>
+    <timeout>https://cpee.org/services/timeout.php</timeout>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="start_url">
+        <parameters>
+          <label>Start</label>
+          <method>:post</method>
+          <arguments>
+            <behavior>wait_running</behavior>
+            <url>https://cpee.org/flow/templates/instantiate/Take_X.xml</url>
+            <init/>
+            <endpoints/>
+            <stream/>
+          </arguments>
+          <stream>
+            <sensors/>
+            <aggregators/>
+            <costs/>
+          </stream>
+          <report>
+            <url/>
+          </report>
+        </parameters>
+        <annotations>
+          <_timing>
+            <_timing_wait/>
+            <_timing_threshold/>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>

data/cockpit/templates/instantiate/Take_X.xml

@@ -0,0 +1,48 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
+    <time>15</time>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout>https://cpee.org/services/timeout.php</timeout>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>:get</method>
+          <arguments>
+            <timeout>!data.time</timeout>
+          </arguments>
+        </parameters>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_attachments/>
+        </_notes>
+        <code>
+          <finalize output="result">data.duration = data.time</finalize>
+          <update output="result"/>
+        </code>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>

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

@@ -89,6 +89,11 @@
         </zeroOrMore>
       </element>
     </element>
+    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
+      <element name="url" rngui:label='HTML Snippet'>
+        <data type="string" rngui:label="url to report snippet"/>
+      </element>
+    </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">

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

@@ -89,6 +89,11 @@
         </zeroOrMore>
       </element>
     </element>
+    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
+      <element name="url" rngui:label='HTML Snippet'>
+        <data type="string" rngui:label="url to report snippet"/>
+      </element>
+    </element>
   </element>
   <element name="code" rngui:header="Implementation">
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/compact/rngs/closed_loop.rng

@@ -0,0 +1,59 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
+  <attribute name="overrun" rngui:label="Interval duration overrun">
+    <choice>
+      <value>wait</value>
+      <value>cancel</value>
+    </choice>
+  </attribute>
+  <attribute name="execution" rngui:label="Measure-control cycle execution">
+    <choice>
+      <value>sequential</value>
+      <value>parallel</value>
+    </choice>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label="Min times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+    <element name="_probability_max" rngui:label="Max times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg times">
+      <data type="nonNegativeInteger" rngui:label="Times"/>
+    </element>
+  </element>
+  <element rngui:ignore="true" name="closed_loop_measuring">
+    <element name="_expected" rngui:header="Values Expected to Change">
+      <zeroOrMore rngui:label="Add Value">
+        <element name="value" rngui:label="Value">
+          <data type="string" rngui:label="a dataelement"/>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+  <element rngui:ignore="true" name="closed_loop_control">
+    <element name="_expected" rngui:header="Values Expected to Change">
+      <zeroOrMore rngui:label="Add Value">
+        <element name="change">
+          <element name="value" rngui:label="Value">
+            <data type="string" rngui:label="a dataelement"/>
+          </element>
+          <element name="upper" rngui:label="Upper Limit">
+            <data type="float" rngui:label="Max value after next measure"/>
+          </element>
+          <element name="lower" rngui:label="Lower Limit">
+            <data type="float" rngui:label="Min value after next measure"/>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+  </element>
+  <element rngui:ignore="true" name="closed_loop_cancel">
+    <attribute name="condition" rngui:label="Condition">
+      <data type="string" rngui:label="Condition"/>
+    </attribute>
+  </element>
+</element>