cpee 2.0.9 → 2.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (152) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/config.json +3 -0
  3. data/cockpit/css/track.css +24 -6
  4. data/cockpit/css/ui.css +5 -2
  5. data/cockpit/css/wfadaptor.css +1 -1
  6. data/cockpit/edit.html +1 -0
  7. data/cockpit/index.html +3 -2
  8. data/cockpit/js/instance.js +82 -55
  9. data/cockpit/js/model.js +1 -1
  10. data/cockpit/js/track.js +10 -0
  11. data/cockpit/js/ui.js +47 -16
  12. data/cockpit/templates/Track Test Local.xml +82 -0
  13. data/cockpit/templates/Track Test.xml +82 -0
  14. data/cockpit/templates/{BPM 2020 Manual Adjust.xml → UR-VUE 2020 Manual Adjust.xml } +1 -1
  15. data/cockpit/templates/{BPM 2020 Solution Baseline.xml → UR-VUE 2020 Solution Baseline.xml } +10 -3
  16. data/cockpit/templates/{BPM 2020 Solution NN.xml → UR-VUE 2020 Solution NN.xml } +1 -1
  17. data/cockpit/templates/{BPM 2020 Solution View.xml → UR-VUE 2020 Solution View.xml } +8 -1
  18. data/cockpit/templates/UR-VUE 2020.xml +26 -0
  19. data/cockpit/templates/instantiate.local/Take_Sub.xml +59 -0
  20. data/cockpit/templates/instantiate/Take_Perf.xml +46 -0
  21. data/cockpit/templates/instantiate/Take_Sub.xml +58 -0
  22. data/cockpit/templates/instantiate/Take_X.xml +48 -0
  23. data/cockpit/themes/compact/rngs/call.rng +5 -0
  24. data/cockpit/themes/compact/rngs/callmanipulate.rng +6 -1
  25. data/cockpit/themes/compact/rngs/closed_loop.rng +59 -0
  26. data/cockpit/themes/compact/rngs/closed_loop_cancel.rng +5 -0
  27. data/cockpit/themes/compact/rngs/closed_loop_control.rng +28 -0
  28. data/cockpit/themes/compact/rngs/closed_loop_measuring.rng +9 -0
  29. data/cockpit/themes/compact/rngs/loop.rng +1 -1
  30. data/cockpit/themes/compact/rngs/parallel.rng +1 -1
  31. data/cockpit/themes/compact/symbols/closed_loop.svg +5 -0
  32. data/cockpit/themes/compact/symbols/closed_loop_cancel.svg +5 -0
  33. data/cockpit/themes/compact/symbols/closed_loop_control.svg +5 -0
  34. data/cockpit/themes/compact/symbols/closed_loop_measuring.svg +6 -0
  35. data/cockpit/themes/default/rngs/call.rng +5 -0
  36. data/cockpit/themes/default/rngs/callmanipulate.rng +6 -1
  37. data/cockpit/themes/default/rngs/closed_loop.rng +59 -0
  38. data/cockpit/themes/default/rngs/closed_loop_cancel.rng +5 -0
  39. data/cockpit/themes/default/rngs/closed_loop_control.rng +28 -0
  40. data/cockpit/themes/default/rngs/closed_loop_measuring.rng +9 -0
  41. data/cockpit/themes/default/rngs/loop.rng +1 -1
  42. data/cockpit/themes/default/rngs/parallel.rng +1 -1
  43. data/cockpit/themes/default/symbols/closed_loop.svg +5 -0
  44. data/cockpit/themes/default/symbols/closed_loop_cancel.svg +5 -0
  45. data/cockpit/themes/default/symbols/closed_loop_control.svg +5 -0
  46. data/cockpit/themes/default/symbols/closed_loop_measuring.svg +6 -0
  47. data/cockpit/themes/diana/rngs/alternative.rng +25 -0
  48. data/cockpit/themes/diana/rngs/call.rng +122 -0
  49. data/cockpit/themes/diana/rngs/callmanipulate.rng +145 -0
  50. data/cockpit/themes/diana/rngs/choose.rng +14 -0
  51. data/cockpit/themes/diana/rngs/closed_loop.rng +59 -0
  52. data/cockpit/themes/diana/rngs/closed_loop_cancel.rng +5 -0
  53. data/cockpit/themes/diana/rngs/closed_loop_control.rng +28 -0
  54. data/cockpit/themes/diana/rngs/closed_loop_measuring.rng +9 -0
  55. data/cockpit/themes/diana/rngs/critical.rng +5 -0
  56. data/cockpit/themes/diana/rngs/escape.rng +1 -0
  57. data/cockpit/themes/diana/rngs/group.rng +3 -0
  58. data/cockpit/themes/diana/rngs/loop.rng +22 -0
  59. data/cockpit/themes/diana/rngs/manipulate.rng +9 -0
  60. data/cockpit/themes/diana/rngs/otherwise.rng +22 -0
  61. data/cockpit/themes/diana/rngs/parallel.rng +21 -0
  62. data/cockpit/themes/diana/rngs/parallel_branch.rng +8 -0
  63. data/cockpit/themes/diana/rngs/scripts.rng +23 -0
  64. data/cockpit/themes/diana/rngs/stop.rng +5 -0
  65. data/cockpit/themes/diana/rngs/terminate.rng +1 -0
  66. data/cockpit/themes/diana/symbols/alternative.svg +5 -0
  67. data/cockpit/themes/diana/symbols/arrow.svg +3 -0
  68. data/cockpit/themes/diana/symbols/call.svg +6 -0
  69. data/cockpit/themes/diana/symbols/callmanipulate.svg +8 -0
  70. data/cockpit/themes/diana/symbols/choose.svg +5 -0
  71. data/cockpit/themes/diana/symbols/choose_exclusive.svg +5 -0
  72. data/cockpit/themes/diana/symbols/choose_inclusive.svg +4 -0
  73. data/cockpit/themes/diana/symbols/closed_loop.svg +5 -0
  74. data/cockpit/themes/diana/symbols/closed_loop_cancel.svg +5 -0
  75. data/cockpit/themes/diana/symbols/closed_loop_control.svg +5 -0
  76. data/cockpit/themes/diana/symbols/closed_loop_measuring.svg +6 -0
  77. data/cockpit/themes/diana/symbols/complex.svg +8 -0
  78. data/cockpit/themes/diana/symbols/critical.svg +4 -0
  79. data/cockpit/themes/diana/symbols/end.svg +3 -0
  80. data/cockpit/themes/diana/symbols/escape.svg +5 -0
  81. data/cockpit/themes/diana/symbols/event_end.svg +3 -0
  82. data/cockpit/themes/diana/symbols/loop.svg +5 -0
  83. data/cockpit/themes/diana/symbols/manipulate.svg +4 -0
  84. data/cockpit/themes/diana/symbols/otherwise.svg +5 -0
  85. data/cockpit/themes/diana/symbols/parallel.svg +5 -0
  86. data/cockpit/themes/diana/symbols/parallel_branch.svg +5 -0
  87. data/cockpit/themes/diana/symbols/parallel_branch_compact.svg +4 -0
  88. data/cockpit/themes/diana/symbols/parallel_branch_event.svg +14 -0
  89. data/cockpit/themes/diana/symbols/parallel_branch_normal.svg +5 -0
  90. data/cockpit/themes/diana/symbols/scripts.svg +4 -0
  91. data/cockpit/themes/diana/symbols/start.svg +3 -0
  92. data/cockpit/themes/diana/symbols/stop.svg +5 -0
  93. data/cockpit/themes/diana/symbols/terminate.svg +4 -0
  94. data/cockpit/themes/diana/theme.js +1650 -0
  95. data/cockpit/themes/extended/rngs/call.rng +5 -0
  96. data/cockpit/themes/extended/rngs/callmanipulate.rng +6 -1
  97. data/cockpit/themes/extended/rngs/closed_loop.rng +59 -0
  98. data/cockpit/themes/extended/rngs/closed_loop_cancel.rng +5 -0
  99. data/cockpit/themes/extended/rngs/closed_loop_control.rng +28 -0
  100. data/cockpit/themes/extended/rngs/closed_loop_measuring.rng +9 -0
  101. data/cockpit/themes/extended/rngs/loop.rng +1 -1
  102. data/cockpit/themes/extended/rngs/parallel.rng +1 -1
  103. data/cockpit/themes/extended/symbols/closed_loop.svg +5 -0
  104. data/cockpit/themes/extended/symbols/closed_loop_cancel.svg +5 -0
  105. data/cockpit/themes/extended/symbols/closed_loop_control.svg +5 -0
  106. data/cockpit/themes/extended/symbols/closed_loop_measuring.svg +6 -0
  107. data/cockpit/themes/extended/theme.js +4 -0
  108. data/cockpit/themes/model/symbols/closed_loop.svg +5 -0
  109. data/cockpit/themes/model/symbols/closed_loop_cancel.svg +5 -0
  110. data/cockpit/themes/model/symbols/closed_loop_control.svg +5 -0
  111. data/cockpit/themes/model/symbols/closed_loop_measuring.svg +6 -0
  112. data/cockpit/themes/packed/rngs/call.rng +5 -0
  113. data/cockpit/themes/packed/rngs/callmanipulate.rng +6 -1
  114. data/cockpit/themes/packed/rngs/closed_loop.rng +59 -0
  115. data/cockpit/themes/packed/rngs/closed_loop_cancel.rng +5 -0
  116. data/cockpit/themes/packed/rngs/closed_loop_control.rng +28 -0
  117. data/cockpit/themes/packed/rngs/closed_loop_measuring.rng +9 -0
  118. data/cockpit/themes/packed/rngs/loop.rng +1 -1
  119. data/cockpit/themes/packed/rngs/parallel.rng +1 -1
  120. data/cockpit/themes/packed/symbols/closed_loop.svg +5 -0
  121. data/cockpit/themes/packed/symbols/closed_loop_cancel.svg +5 -0
  122. data/cockpit/themes/packed/symbols/closed_loop_control.svg +5 -0
  123. data/cockpit/themes/packed/symbols/closed_loop_measuring.svg +6 -0
  124. data/cockpit/themes/preset/rngs/call.rng +5 -0
  125. data/cockpit/themes/preset/rngs/callmanipulate.rng +6 -1
  126. data/cockpit/themes/preset/rngs/closed_loop.rng +59 -0
  127. data/cockpit/themes/preset/rngs/closed_loop_cancel.rng +5 -0
  128. data/cockpit/themes/preset/rngs/closed_loop_control.rng +28 -0
  129. data/cockpit/themes/preset/rngs/closed_loop_measuring.rng +9 -0
  130. data/cockpit/themes/preset/rngs/loop.rng +1 -1
  131. data/cockpit/themes/preset/rngs/parallel.rng +1 -1
  132. data/cockpit/themes/preset/symbols/closed_loop.svg +5 -0
  133. data/cockpit/themes/preset/symbols/closed_loop_cancel.svg +5 -0
  134. data/cockpit/themes/preset/symbols/closed_loop_control.svg +5 -0
  135. data/cockpit/themes/preset/symbols/closed_loop_measuring.svg +6 -0
  136. data/cockpit/track.html +37 -8
  137. data/cpee.gemspec +2 -2
  138. data/lib/cpee/controller.rb +3 -2
  139. data/lib/cpee/implementation.rb +14 -5
  140. data/lib/cpee/implementation_notifications.rb +80 -51
  141. data/lib/cpee/implementation_properties.rb +5 -2
  142. data/lib/cpee/persistence.rb +3 -0
  143. data/server/handlerwrappers/default.rb +4 -5
  144. data/server/routing/forward-events.rb +2 -1
  145. data/server/routing/forward-votes.rb +6 -2
  146. data/server/server.conf +4 -0
  147. data/tools/cpee +7 -8
  148. data/tools/server/server.rb +1 -0
  149. metadata +110 -11
  150. data/cockpit/templates/BPM 2020.xml +0 -26
  151. data/cockpit/templates/convert_cpee2.rb +0 -15
  152. data/cockpit/themes/convert_cpee2.rb +0 -8
data/cockpit/themes/extended/rngs/call.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
data/cockpit/themes/extended/rngs/callmanipulate.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
data/cockpit/themes/extended/rngs/closed_loop.rng ADDED
@@ -0,0 +1,59 @@
1
+ <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
5
+ <attribute name="overrun" rngui:label="Interval duration overrun">
6
+ <choice>
7
+ <value>wait</value>
8
+ <value>cancel</value>
9
+ </choice>
10
+ </attribute>
11
+ <attribute name="execution" rngui:label="Measure-control cycle execution">
12
+ <choice>
13
+ <value>sequential</value>
14
+ <value>parallel</value>
15
+ </choice>
16
+ </attribute>
17
+ <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
18
+ <element name="_probability_min" rngui:label="Min times">
19
+ <data type="nonNegativeInteger" rngui:label="Times"/>
20
+ </element>
21
+ <element name="_probability_max" rngui:label="Max times">
22
+ <data type="nonNegativeInteger" rngui:label="Times"/>
23
+ </element>
24
+ <element name="_probability_avg" rngui:label="Avg times">
25
+ <data type="nonNegativeInteger" rngui:label="Times"/>
26
+ </element>
27
+ </element>
28
+ <element rngui:ignore="true" name="closed_loop_measuring">
29
+ <element name="_expected" rngui:header="Values Expected to Change">
30
+ <zeroOrMore rngui:label="Add Value">
31
+ <element name="value" rngui:label="Value">
32
+ <data type="string" rngui:label="a dataelement"/>
33
+ </element>
34
+ </zeroOrMore>
35
+ </element>
36
+ </element>
37
+ <element rngui:ignore="true" name="closed_loop_control">
38
+ <element name="_expected" rngui:header="Values Expected to Change">
39
+ <zeroOrMore rngui:label="Add Value">
40
+ <element name="change">
41
+ <element name="value" rngui:label="Value">
42
+ <data type="string" rngui:label="a dataelement"/>
43
+ </element>
44
+ <element name="upper" rngui:label="Upper Limit">
45
+ <data type="float" rngui:label="Max value after next measure"/>
46
+ </element>
47
+ <element name="lower" rngui:label="Lower Limit">
48
+ <data type="float" rngui:label="Min value after next measure"/>
49
+ </element>
50
+ </element>
51
+ </zeroOrMore>
52
+ </element>
53
+ </element>
54
+ <element rngui:ignore="true" name="closed_loop_cancel">
55
+ <attribute name="condition" rngui:label="Condition">
56
+ <data type="string" rngui:label="Condition"/>
57
+ </attribute>
58
+ </element>
59
+ </element>
data/cockpit/themes/extended/rngs/closed_loop_cancel.rng ADDED
@@ -0,0 +1,5 @@
1
+ <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">
2
+ <attribute name="condition" rngui:label="Condition">
3
+ <data type="string" rngui:label="Condition"/>
4
+ </attribute>
5
+ </element>
data/cockpit/themes/extended/rngs/closed_loop_control.rng ADDED
@@ -0,0 +1,28 @@
1
+ <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">
2
+ <element name="_expected" rngui:header="Values Expected to Change">
3
+ <zeroOrMore rngui:label="Add Value">
4
+ <element name="change">
5
+ <element name="type" rngui:label="Control type">
6
+ <choice>
7
+ <value>:PID</value>
8
+ <value>:PI</value>
9
+ <value>:PD</value>
10
+ <value>:P</value>
11
+ <value>:I</value>
12
+ <value>:PT1</value>
13
+ <value>:PT2</value>
14
+ </choice>
15
+ </element>
16
+ <element name="value" rngui:label="Value">
17
+ <data type="string" rngui:label="a dataelement"/>
18
+ </element>
19
+ <element name="upper" rngui:label="Upper Limit">
20
+ <data type="float" rngui:label="Max value after next measure"/>
21
+ </element>
22
+ <element name="lower" rngui:label="Lower Limit">
23
+ <data type="float" rngui:label="Min value after next measure"/>
24
+ </element>
25
+ </element>
26
+ </zeroOrMore>
27
+ </element>
28
+ </element>
data/cockpit/themes/extended/rngs/closed_loop_measuring.rng ADDED
@@ -0,0 +1,9 @@
1
+ <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">
2
+ <element name="_expected" rngui:header="Values Expected to Change">
3
+ <zeroOrMore rngui:label="Add Value">
4
+ <element name="value" rngui:label="Value">
5
+ <data type="string" rngui:label="a dataelement"/>
6
+ </element>
7
+ </zeroOrMore>
8
+ </element>
9
+ </element>
data/cockpit/themes/extended/rngs/loop.rng CHANGED
@@ -19,4 +19,4 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
- </element>
22
+ </element>
data/cockpit/themes/extended/rngs/parallel.rng CHANGED
@@ -18,4 +18,4 @@
18
18
  <data type="string"/>
19
19
  </attribute>
20
20
  </element>
21
- </element>
21
+ </element>
data/cockpit/themes/extended/symbols/closed_loop.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <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"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/extended/symbols/closed_loop_cancel.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/extended/symbols/closed_loop_control.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <circle cx="15" cy="15" r="7" class="stand"/> <path d="M 17,17 19.84375,19.84375" class="black stand"/>
5
+ </svg>
data/cockpit/themes/extended/symbols/closed_loop_measuring.svg ADDED
@@ -0,0 +1,6 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ <path d="M 14.970098,15.079625 11.963937,10.870986" class="black stand"/>
6
+ </svg>
data/cockpit/themes/extended/theme.js CHANGED
@@ -267,6 +267,7 @@ function WFAdaptorManifestation(adaptor) {
267
267
  var ep = self.endpoints[$(node).attr('endpoint')];
268
268
  var wait = $('_timing_wait',$(node).children('annotations')).text();
269
269
  var threshold = $('_timing_threshold',$(node).children('annotations')).text();
270
+ var adur = $('_timing_avg',$(node).children('annotations')).text();
270
271
  var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
271
272
  var ret = [ { column: 'ID', value: $(node).attr('id') } ];
272
273
  if (lab != '') {
@@ -278,6 +279,9 @@ function WFAdaptorManifestation(adaptor) {
278
279
  if (threshold != '') {
279
280
  ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
280
281
  }
282
+ if (adur != '') {
283
+ ret.push({ column: 'Duration', value: '~T = ' + adur + 'm' });
284
+ }
281
285
  return ret;
282
286
  },
283
287
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
data/cockpit/themes/model/symbols/closed_loop.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <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"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/model/symbols/closed_loop_cancel.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/model/symbols/closed_loop_control.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <circle cx="15" cy="15" r="7" class="stand"/> <path d="M 17,17 19.84375,19.84375" class="black stand"/>
5
+ </svg>
data/cockpit/themes/model/symbols/closed_loop_measuring.svg ADDED
@@ -0,0 +1,6 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ <path d="M 14.970098,15.079625 11.963937,10.870986" class="black stand"/>
6
+ </svg>
data/cockpit/themes/packed/rngs/call.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
data/cockpit/themes/packed/rngs/callmanipulate.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
data/cockpit/themes/packed/rngs/closed_loop.rng ADDED
@@ -0,0 +1,59 @@
1
+ <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
5
+ <attribute name="overrun" rngui:label="Interval duration overrun">
6
+ <choice>
7
+ <value>wait</value>
8
+ <value>cancel</value>
9
+ </choice>
10
+ </attribute>
11
+ <attribute name="execution" rngui:label="Measure-control cycle execution">
12
+ <choice>
13
+ <value>sequential</value>
14
+ <value>parallel</value>
15
+ </choice>
16
+ </attribute>
17
+ <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
18
+ <element name="_probability_min" rngui:label="Min times">
19
+ <data type="nonNegativeInteger" rngui:label="Times"/>
20
+ </element>
21
+ <element name="_probability_max" rngui:label="Max times">
22
+ <data type="nonNegativeInteger" rngui:label="Times"/>
23
+ </element>
24
+ <element name="_probability_avg" rngui:label="Avg times">
25
+ <data type="nonNegativeInteger" rngui:label="Times"/>
26
+ </element>
27
+ </element>
28
+ <element rngui:ignore="true" name="closed_loop_measuring">
29
+ <element name="_expected" rngui:header="Values Expected to Change">
30
+ <zeroOrMore rngui:label="Add Value">
31
+ <element name="value" rngui:label="Value">
32
+ <data type="string" rngui:label="a dataelement"/>
33
+ </element>
34
+ </zeroOrMore>
35
+ </element>
36
+ </element>
37
+ <element rngui:ignore="true" name="closed_loop_control">
38
+ <element name="_expected" rngui:header="Values Expected to Change">
39
+ <zeroOrMore rngui:label="Add Value">
40
+ <element name="change">
41
+ <element name="value" rngui:label="Value">
42
+ <data type="string" rngui:label="a dataelement"/>
43
+ </element>
44
+ <element name="upper" rngui:label="Upper Limit">
45
+ <data type="float" rngui:label="Max value after next measure"/>
46
+ </element>
47
+ <element name="lower" rngui:label="Lower Limit">
48
+ <data type="float" rngui:label="Min value after next measure"/>
49
+ </element>
50
+ </element>
51
+ </zeroOrMore>
52
+ </element>
53
+ </element>
54
+ <element rngui:ignore="true" name="closed_loop_cancel">
55
+ <attribute name="condition" rngui:label="Condition">
56
+ <data type="string" rngui:label="Condition"/>
57
+ </attribute>
58
+ </element>
59
+ </element>
data/cockpit/themes/packed/rngs/closed_loop_cancel.rng ADDED
@@ -0,0 +1,5 @@
1
+ <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">
2
+ <attribute name="condition" rngui:label="Condition">
3
+ <data type="string" rngui:label="Condition"/>
4
+ </attribute>
5
+ </element>
data/cockpit/themes/packed/rngs/closed_loop_control.rng ADDED
@@ -0,0 +1,28 @@
1
+ <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">
2
+ <element name="_expected" rngui:header="Values Expected to Change">
3
+ <zeroOrMore rngui:label="Add Value">
4
+ <element name="change">
5
+ <element name="type" rngui:label="Control type">
6
+ <choice>
7
+ <value>:PID</value>
8
+ <value>:PI</value>
9
+ <value>:PD</value>
10
+ <value>:P</value>
11
+ <value>:I</value>
12
+ <value>:PT1</value>
13
+ <value>:PT2</value>
14
+ </choice>
15
+ </element>
16
+ <element name="value" rngui:label="Value">
17
+ <data type="string" rngui:label="a dataelement"/>
18
+ </element>
19
+ <element name="upper" rngui:label="Upper Limit">
20
+ <data type="float" rngui:label="Max value after next measure"/>
21
+ </element>
22
+ <element name="lower" rngui:label="Lower Limit">
23
+ <data type="float" rngui:label="Min value after next measure"/>
24
+ </element>
25
+ </element>
26
+ </zeroOrMore>
27
+ </element>
28
+ </element>
data/cockpit/themes/packed/rngs/closed_loop_measuring.rng ADDED
@@ -0,0 +1,9 @@
1
+ <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">
2
+ <element name="_expected" rngui:header="Values Expected to Change">
3
+ <zeroOrMore rngui:label="Add Value">
4
+ <element name="value" rngui:label="Value">
5
+ <data type="string" rngui:label="a dataelement"/>
6
+ </element>
7
+ </zeroOrMore>
8
+ </element>
9
+ </element>
data/cockpit/themes/packed/rngs/loop.rng CHANGED
@@ -19,4 +19,4 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
- </element>
22
+ </element>
data/cockpit/themes/packed/rngs/parallel.rng CHANGED
@@ -18,4 +18,4 @@
18
18
  <data type="string"/>
19
19
  </attribute>
20
20
  </element>
21
- </element>
21
+ </element>
data/cockpit/themes/packed/symbols/closed_loop.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
3
+ <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"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/packed/symbols/closed_loop_cancel.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ </svg>
data/cockpit/themes/packed/symbols/closed_loop_control.svg ADDED
@@ -0,0 +1,5 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <circle cx="15" cy="15" r="7" class="stand"/> <path d="M 17,17 19.84375,19.84375" class="black stand"/>
5
+ </svg>
data/cockpit/themes/packed/symbols/closed_loop_measuring.svg ADDED
@@ -0,0 +1,6 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <circle cx="15" cy="15" r="14" class="cline stand"/>
3
+ <circle cx="15" cy="15" r="11" class="rfill hfill cline stand"/>
4
+ <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"/>
5
+ <path d="M 14.970098,15.079625 11.963937,10.870986" class="black stand"/>
6
+ </svg>
data/cockpit/themes/preset/rngs/call.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="annotations" rngui:header="Annotations">
94
99
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
data/cockpit/themes/preset/rngs/callmanipulate.rng CHANGED
@@ -89,6 +89,11 @@
89
89
  </zeroOrMore>
90
90
  </element>
91
91
  </element>
92
+ <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
93
+ <element name="url" rngui:label='HTML Snippet'>
94
+ <data type="string" rngui:label="url to report snippet"/>
95
+ </element>
96
+ </element>
92
97
  </element>
93
98
  <element name="code" rngui:header="Implementation">
94
99
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -137,4 +142,4 @@
137
142
  </element>
138
143
  </element>
139
144
  </element>
140
- </element>
145
+ </element>
data/cockpit/themes/preset/rngs/closed_loop.rng ADDED
@@ -0,0 +1,59 @@
1
+ <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
5
+ <attribute name="overrun" rngui:label="Interval duration overrun">
6
+ <choice>
7
+ <value>wait</value>
8
+ <value>cancel</value>
9
+ </choice>
10
+ </attribute>
11
+ <attribute name="execution" rngui:label="Measure-control cycle execution">
12
+ <choice>
13
+ <value>sequential</value>
14
+ <value>parallel</value>
15
+ </choice>
16
+ </attribute>
17
+ <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
18
+ <element name="_probability_min" rngui:label="Min times">
19
+ <data type="nonNegativeInteger" rngui:label="Times"/>
20
+ </element>
21
+ <element name="_probability_max" rngui:label="Max times">
22
+ <data type="nonNegativeInteger" rngui:label="Times"/>
23
+ </element>
24
+ <element name="_probability_avg" rngui:label="Avg times">
25
+ <data type="nonNegativeInteger" rngui:label="Times"/>
26
+ </element>
27
+ </element>
28
+ <element rngui:ignore="true" name="closed_loop_measuring">
29
+ <element name="_expected" rngui:header="Values Expected to Change">
30
+ <zeroOrMore rngui:label="Add Value">
31
+ <element name="value" rngui:label="Value">
32
+ <data type="string" rngui:label="a dataelement"/>
33
+ </element>
34
+ </zeroOrMore>
35
+ </element>
36
+ </element>
37
+ <element rngui:ignore="true" name="closed_loop_control">
38
+ <element name="_expected" rngui:header="Values Expected to Change">
39
+ <zeroOrMore rngui:label="Add Value">
40
+ <element name="change">
41
+ <element name="value" rngui:label="Value">
42
+ <data type="string" rngui:label="a dataelement"/>
43
+ </element>
44
+ <element name="upper" rngui:label="Upper Limit">
45
+ <data type="float" rngui:label="Max value after next measure"/>
46
+ </element>
47
+ <element name="lower" rngui:label="Lower Limit">
48
+ <data type="float" rngui:label="Min value after next measure"/>
49
+ </element>
50
+ </element>
51
+ </zeroOrMore>
52
+ </element>
53
+ </element>
54
+ <element rngui:ignore="true" name="closed_loop_cancel">
55
+ <attribute name="condition" rngui:label="Condition">
56
+ <data type="string" rngui:label="Condition"/>
57
+ </attribute>
58
+ </element>
59
+ </element>