RubyGems - cpee - Versions diffs - 2.0.9 → 2.0.16 - Mend

cpee 2.0.9 → 2.0.16

Files changed (152) hide show

checksums.yaml +4 -4
data/cockpit/config.json +3 -0
data/cockpit/css/track.css +24 -6
data/cockpit/css/ui.css +5 -2
data/cockpit/css/wfadaptor.css +1 -1
data/cockpit/edit.html +1 -0
data/cockpit/index.html +3 -2
data/cockpit/js/instance.js +82 -55
data/cockpit/js/model.js +1 -1
data/cockpit/js/track.js +10 -0
data/cockpit/js/ui.js +47 -16
data/cockpit/templates/Track Test Local.xml +82 -0
data/cockpit/templates/Track Test.xml +82 -0
data/cockpit/templates/{BPM 2020 Manual Adjust.xml → UR-VUE 2020 Manual Adjust.xml } +1 -1
data/cockpit/templates/{BPM 2020 Solution Baseline.xml → UR-VUE 2020 Solution Baseline.xml } +10 -3
data/cockpit/templates/{BPM 2020 Solution NN.xml → UR-VUE 2020 Solution NN.xml } +1 -1
data/cockpit/templates/{BPM 2020 Solution View.xml → UR-VUE 2020 Solution View.xml } +8 -1
data/cockpit/templates/UR-VUE 2020.xml +26 -0
data/cockpit/templates/instantiate.local/Take_Sub.xml +59 -0
data/cockpit/templates/instantiate/Take_Perf.xml +46 -0
data/cockpit/templates/instantiate/Take_Sub.xml +58 -0
data/cockpit/templates/instantiate/Take_X.xml +48 -0
data/cockpit/themes/compact/rngs/call.rng +5 -0
data/cockpit/themes/compact/rngs/callmanipulate.rng +6 -1
data/cockpit/themes/compact/rngs/closed_loop.rng +59 -0
data/cockpit/themes/compact/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/compact/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/compact/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/compact/rngs/loop.rng +1 -1
data/cockpit/themes/compact/rngs/parallel.rng +1 -1
data/cockpit/themes/compact/symbols/closed_loop.svg +5 -0
data/cockpit/themes/compact/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/compact/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/compact/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/default/rngs/call.rng +5 -0
data/cockpit/themes/default/rngs/callmanipulate.rng +6 -1
data/cockpit/themes/default/rngs/closed_loop.rng +59 -0
data/cockpit/themes/default/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/default/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/default/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/default/rngs/loop.rng +1 -1
data/cockpit/themes/default/rngs/parallel.rng +1 -1
data/cockpit/themes/default/symbols/closed_loop.svg +5 -0
data/cockpit/themes/default/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/default/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/default/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/diana/rngs/alternative.rng +25 -0
data/cockpit/themes/diana/rngs/call.rng +122 -0
data/cockpit/themes/diana/rngs/callmanipulate.rng +145 -0
data/cockpit/themes/diana/rngs/choose.rng +14 -0
data/cockpit/themes/diana/rngs/closed_loop.rng +59 -0
data/cockpit/themes/diana/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/diana/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/diana/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/diana/rngs/critical.rng +5 -0
data/cockpit/themes/diana/rngs/escape.rng +1 -0
data/cockpit/themes/diana/rngs/group.rng +3 -0
data/cockpit/themes/diana/rngs/loop.rng +22 -0
data/cockpit/themes/diana/rngs/manipulate.rng +9 -0
data/cockpit/themes/diana/rngs/otherwise.rng +22 -0
data/cockpit/themes/diana/rngs/parallel.rng +21 -0
data/cockpit/themes/diana/rngs/parallel_branch.rng +8 -0
data/cockpit/themes/diana/rngs/scripts.rng +23 -0
data/cockpit/themes/diana/rngs/stop.rng +5 -0
data/cockpit/themes/diana/rngs/terminate.rng +1 -0
data/cockpit/themes/diana/symbols/alternative.svg +5 -0
data/cockpit/themes/diana/symbols/arrow.svg +3 -0
data/cockpit/themes/diana/symbols/call.svg +6 -0
data/cockpit/themes/diana/symbols/callmanipulate.svg +8 -0
data/cockpit/themes/diana/symbols/choose.svg +5 -0
data/cockpit/themes/diana/symbols/choose_exclusive.svg +5 -0
data/cockpit/themes/diana/symbols/choose_inclusive.svg +4 -0
data/cockpit/themes/diana/symbols/closed_loop.svg +5 -0
data/cockpit/themes/diana/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/diana/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/diana/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/diana/symbols/complex.svg +8 -0
data/cockpit/themes/diana/symbols/critical.svg +4 -0
data/cockpit/themes/diana/symbols/end.svg +3 -0
data/cockpit/themes/diana/symbols/escape.svg +5 -0
data/cockpit/themes/diana/symbols/event_end.svg +3 -0
data/cockpit/themes/diana/symbols/loop.svg +5 -0
data/cockpit/themes/diana/symbols/manipulate.svg +4 -0
data/cockpit/themes/diana/symbols/otherwise.svg +5 -0
data/cockpit/themes/diana/symbols/parallel.svg +5 -0
data/cockpit/themes/diana/symbols/parallel_branch.svg +5 -0
data/cockpit/themes/diana/symbols/parallel_branch_compact.svg +4 -0
data/cockpit/themes/diana/symbols/parallel_branch_event.svg +14 -0
data/cockpit/themes/diana/symbols/parallel_branch_normal.svg +5 -0
data/cockpit/themes/diana/symbols/scripts.svg +4 -0
data/cockpit/themes/diana/symbols/start.svg +3 -0
data/cockpit/themes/diana/symbols/stop.svg +5 -0
data/cockpit/themes/diana/symbols/terminate.svg +4 -0
data/cockpit/themes/diana/theme.js +1650 -0
data/cockpit/themes/extended/rngs/call.rng +5 -0
data/cockpit/themes/extended/rngs/callmanipulate.rng +6 -1
data/cockpit/themes/extended/rngs/closed_loop.rng +59 -0
data/cockpit/themes/extended/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/extended/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/extended/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/extended/rngs/loop.rng +1 -1
data/cockpit/themes/extended/rngs/parallel.rng +1 -1
data/cockpit/themes/extended/symbols/closed_loop.svg +5 -0
data/cockpit/themes/extended/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/extended/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/extended/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/extended/theme.js +4 -0
data/cockpit/themes/model/symbols/closed_loop.svg +5 -0
data/cockpit/themes/model/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/model/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/model/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/packed/rngs/call.rng +5 -0
data/cockpit/themes/packed/rngs/callmanipulate.rng +6 -1
data/cockpit/themes/packed/rngs/closed_loop.rng +59 -0
data/cockpit/themes/packed/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/packed/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/packed/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/packed/rngs/loop.rng +1 -1
data/cockpit/themes/packed/rngs/parallel.rng +1 -1
data/cockpit/themes/packed/symbols/closed_loop.svg +5 -0
data/cockpit/themes/packed/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/packed/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/packed/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/themes/preset/rngs/call.rng +5 -0
data/cockpit/themes/preset/rngs/callmanipulate.rng +6 -1
data/cockpit/themes/preset/rngs/closed_loop.rng +59 -0
data/cockpit/themes/preset/rngs/closed_loop_cancel.rng +5 -0
data/cockpit/themes/preset/rngs/closed_loop_control.rng +28 -0
data/cockpit/themes/preset/rngs/closed_loop_measuring.rng +9 -0
data/cockpit/themes/preset/rngs/loop.rng +1 -1
data/cockpit/themes/preset/rngs/parallel.rng +1 -1
data/cockpit/themes/preset/symbols/closed_loop.svg +5 -0
data/cockpit/themes/preset/symbols/closed_loop_cancel.svg +5 -0
data/cockpit/themes/preset/symbols/closed_loop_control.svg +5 -0
data/cockpit/themes/preset/symbols/closed_loop_measuring.svg +6 -0
data/cockpit/track.html +37 -8
data/cpee.gemspec +2 -2
data/lib/cpee/controller.rb +3 -2
data/lib/cpee/implementation.rb +14 -5
data/lib/cpee/implementation_notifications.rb +80 -51
data/lib/cpee/implementation_properties.rb +5 -2
data/lib/cpee/persistence.rb +3 -0
data/server/handlerwrappers/default.rb +4 -5
data/server/routing/forward-events.rb +2 -1
data/server/routing/forward-votes.rb +6 -2
data/server/server.conf +4 -0
data/tools/cpee +7 -8
data/tools/server/server.rb +1 -0
metadata +110 -11
data/cockpit/templates/BPM 2020.xml +0 -26
data/cockpit/templates/convert_cpee2.rb +0 -15
data/cockpit/themes/convert_cpee2.rb +0 -8

data/cockpit/themes/compact/rngs/closed_loop_cancel.rng ADDED

@@ -0,0 +1,5 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_cancel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+</element>

data/cockpit/themes/compact/rngs/closed_loop_control.rng ADDED

@@ -0,0 +1,28 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <element name="_expected" rngui:header="Values Expected to Change">
+    <zeroOrMore rngui:label="Add Value">
+      <element name="change">
+        <element name="type" rngui:label="Control type">
+          <choice>
+            <value>:PID</value>
+            <value>:PI</value>
+            <value>:PD</value>
+            <value>:P</value>
+            <value>:I</value>
+            <value>:PT1</value>
+            <value>:PT2</value>
+          </choice>
+        </element>
+        <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>

data/cockpit/themes/compact/rngs/closed_loop_measuring.rng ADDED

@@ -0,0 +1,9 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <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>

data/cockpit/themes/compact/rngs/loop.rng CHANGED

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/compact/rngs/parallel.rng CHANGED

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/compact/symbols/closed_loop.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <path d="m 17.620194,6.2873424 c 7.577463,7.5774646 -7.577463,10.5124376 0,18.0898996" class="stand" style="fill-opacity: 0"/>
+  <path d="m 14.036033,6.2873424 c 7.577463,7.5774646 -7.5774629,10.5124376 0,18.0898996" class="stand" style="fill-opacity: 0"/>
+</svg>

data/cockpit/themes/compact/symbols/closed_loop_cancel.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+ <path  d="M 7.8583963,10.061007 10.29692,7.6153325 15.17399,12.506704 20.051062,7.6153325 22.489583,10.06103 17.612536,14.952378 22.489583,19.84375 20.051062,22.289424 15.17399,17.398076 10.296942,22.289424 7.8583963,19.84375 12.735466,14.952378 Z"  class="stand"/>
+</svg>

data/cockpit/themes/compact/symbols/closed_loop_control.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+ <circle cx="15" cy="15" r="7" class="stand"/>  <path d="M 17,17 19.84375,19.84375" class="black stand"/>
+</svg>

data/cockpit/themes/compact/symbols/closed_loop_measuring.svg ADDED

@@ -0,0 +1,6 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+  <path d="M 14.904335,6.0646408 A 9.0152948,9.0152948 0 0 0 5.9550908,15.079625 H 23.985106 a 9.0152948,9.0152948 0 0 0 -9.015008,-9.0149842 9.0152948,9.0152948 0 0 0 -0.06567,0 z" class="standfat"/>
+  <path d="M 14.970098,15.079625 11.963937,10.870986" class="black stand"/>
+</svg>

data/cockpit/themes/default/rngs/call.rng CHANGED

@@ -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/default/rngs/callmanipulate.rng CHANGED

@@ -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/default/rngs/closed_loop.rng ADDED

@@ -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>

data/cockpit/themes/default/rngs/closed_loop_cancel.rng ADDED

@@ -0,0 +1,5 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_cancel" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+</element>

data/cockpit/themes/default/rngs/closed_loop_control.rng ADDED

@@ -0,0 +1,28 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <element name="_expected" rngui:header="Values Expected to Change">
+    <zeroOrMore rngui:label="Add Value">
+      <element name="change">
+        <element name="type" rngui:label="Control type">
+          <choice>
+            <value>:PID</value>
+            <value>:PI</value>
+            <value>:PD</value>
+            <value>:P</value>
+            <value>:I</value>
+            <value>:PT1</value>
+            <value>:PT2</value>
+          </choice>
+        </element>
+        <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>

data/cockpit/themes/default/rngs/closed_loop_measuring.rng ADDED

@@ -0,0 +1,9 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <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>

data/cockpit/themes/default/rngs/loop.rng CHANGED

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/default/rngs/parallel.rng CHANGED

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/default/symbols/closed_loop.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <path d="m 17.620194,6.2873424 c 7.577463,7.5774646 -7.577463,10.5124376 0,18.0898996" class="stand" style="fill-opacity: 0"/>
+  <path d="m 14.036033,6.2873424 c 7.577463,7.5774646 -7.5774629,10.5124376 0,18.0898996" class="stand" style="fill-opacity: 0"/>
+</svg>

data/cockpit/themes/default/symbols/closed_loop_cancel.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+ <path  d="M 7.8583963,10.061007 10.29692,7.6153325 15.17399,12.506704 20.051062,7.6153325 22.489583,10.06103 17.612536,14.952378 22.489583,19.84375 20.051062,22.289424 15.17399,17.398076 10.296942,22.289424 7.8583963,19.84375 12.735466,14.952378 Z"  class="stand"/>
+</svg>

data/cockpit/themes/default/symbols/closed_loop_control.svg ADDED

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+ <circle cx="15" cy="15" r="7" class="stand"/>  <path d="M 17,17 19.84375,19.84375" class="black stand"/>
+</svg>

data/cockpit/themes/default/symbols/closed_loop_measuring.svg ADDED

@@ -0,0 +1,6 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
+  <path d="M 14.904335,6.0646408 A 9.0152948,9.0152948 0 0 0 5.9550908,15.079625 H 23.985106 a 9.0152948,9.0152948 0 0 0 -9.015008,-9.0149842 9.0152948,9.0152948 0 0 0 -0.06567,0 z" class="standfat"/>
+  <path d="M 14.970098,15.079625 11.963937,10.870986" class="black stand"/>
+</svg>

data/cockpit/themes/diana/rngs/alternative.rng ADDED

@@ -0,0 +1,25 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="condition" rngui:label="Condition">
+    <data type="string" rngui:label="Condition"/>
+  </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label="Min in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label="Max in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label="Avg in %">
+      <data type="integer" rngui:label="Percent 0-100">
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

data/cockpit/themes/diana/rngs/call.rng ADDED

@@ -0,0 +1,122 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="endpoint" rngui:label="Endpoint">
+    <data type="string"/>
+  </attribute>
+  <element name="parameters" rngui:header="Properties">
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
+    </element>
+    <element name="method" rngui:label="Method">
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="arguments" rngui:header="Arguments">
+      <zeroOrMore rngui:label="Create Argument Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Sensor">
+          <element name="sensor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name="cost_factor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
+          </element>
+        </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">
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
+      </element>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
+      </element>
+      <element name="_timing_min" rngui:label="Min in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_max" rngui:label="Max in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+    </element>
+    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
+    </element>
+  </element>
+</element>

data/cockpit/themes/diana/rngs/callmanipulate.rng ADDED

@@ -0,0 +1,145 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+  <attribute name="endpoint" rngui:label="Endpoint">
+    <data type="string"/>
+  </attribute>
+  <element name="parameters" rngui:header="Properties">
+    <element name="label" rngui:label="Label">
+      <data type="string" rngui:label="Short description of the task"/>
+    </element>
+    <element name="method" rngui:label="Method">
+      <choice>
+        <value>:post</value>
+        <value>:get</value>
+        <value>:put</value>
+        <value>:delete</value>
+      </choice>
+    </element>
+    <element name="arguments" rngui:header="Arguments">
+      <zeroOrMore rngui:label="Create Argument Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
+    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Sensor">
+          <element name="sensor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name="cost_factor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
+          </element>
+        </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">
+      <text rngui:label="Script that is executed, before a service call"/>
+    </element>
+    <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, when a service returns data"/>
+    </element>
+    <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, when a service sends intermediate data"/>
+    </element>
+    <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, if a service call fails"/>
+    </element>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]"/>
+      </element>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]"/>
+      </element>
+      <element name="_timing_min" rngui:label="Min in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_max" rngui:label="Max in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+    </element>
+    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
+    </element>
+  </element>
+</element>