cpee 2.0.21 → 2.0.26

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 (118) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/CPEE.xml +8 -0
  3. data/cockpit/Signavio.xml +8 -0
  4. data/cockpit/css/model.css +2 -0
  5. data/cockpit/css/replay.css +55 -0
  6. data/cockpit/css/ui.css +29 -5
  7. data/cockpit/edit.html +263 -0
  8. data/cockpit/graph.html +3 -3
  9. data/cockpit/index.html +11 -8
  10. data/cockpit/js/details.js +0 -1
  11. data/cockpit/js/edit.js +32 -0
  12. data/cockpit/js/instance.js +52 -52
  13. data/cockpit/js/model.js +6 -36
  14. data/cockpit/js/parameters.js +9 -4
  15. data/cockpit/js/replay.js +40 -0
  16. data/cockpit/js/ui.js +7 -0
  17. data/cockpit/model.html +8 -4
  18. data/cockpit/replay.html +53 -0
  19. data/cockpit/templates/Coopis 2010.xml +1 -1
  20. data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml +1 -1
  21. data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml +1 -1
  22. data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml +1 -1
  23. data/cockpit/templates/Track Test Local.xml +6 -2
  24. data/cockpit/templates/Track Test.xml +5 -1
  25. data/cockpit/templates/UR-VUE 2020 Manual Adjust.xml +5 -1
  26. data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml +8 -4
  27. data/cockpit/templates/UR-VUE 2020 Solution NN.xml +8 -4
  28. data/cockpit/templates/UR-VUE 2020 Solution View.xml +8 -4
  29. data/cockpit/templates/UR-VUE 2020.xml +8 -4
  30. data/cockpit/templates/instantiate.local/Take_Sub.xml +1 -1
  31. data/cockpit/themes/compact/rngs/call.rng +93 -41
  32. data/cockpit/themes/compact/rngs/callmanipulate.rng +113 -40
  33. data/cockpit/themes/compact/theme.js +57 -25
  34. data/cockpit/themes/{diana → control}/rngs/alternative.rng +0 -0
  35. data/cockpit/themes/control/rngs/call.rng +174 -0
  36. data/cockpit/themes/control/rngs/callmanipulate.rng +218 -0
  37. data/cockpit/themes/{diana → control}/rngs/choose.rng +0 -0
  38. data/cockpit/themes/{diana → control}/rngs/closed_loop.rng +0 -0
  39. data/cockpit/themes/{diana → control}/rngs/closed_loop_cancel.rng +0 -0
  40. data/cockpit/themes/{diana → control}/rngs/closed_loop_control.rng +0 -0
  41. data/cockpit/themes/{diana → control}/rngs/closed_loop_measuring.rng +0 -0
  42. data/cockpit/themes/{diana → control}/rngs/critical.rng +0 -0
  43. data/cockpit/themes/{diana → control}/rngs/escape.rng +0 -0
  44. data/cockpit/themes/{diana → control}/rngs/group.rng +0 -0
  45. data/cockpit/themes/{diana → control}/rngs/loop.rng +0 -0
  46. data/cockpit/themes/{diana → control}/rngs/manipulate.rng +0 -0
  47. data/cockpit/themes/{diana → control}/rngs/otherwise.rng +0 -0
  48. data/cockpit/themes/{diana → control}/rngs/parallel.rng +0 -0
  49. data/cockpit/themes/{diana → control}/rngs/parallel_branch.rng +0 -0
  50. data/cockpit/themes/{diana → control}/rngs/scripts.rng +0 -0
  51. data/cockpit/themes/{diana → control}/rngs/stop.rng +0 -0
  52. data/cockpit/themes/{diana → control}/rngs/terminate.rng +0 -0
  53. data/cockpit/themes/{diana → control}/symbols/alternative.svg +0 -0
  54. data/cockpit/themes/{diana → control}/symbols/arrow.svg +0 -0
  55. data/cockpit/themes/{diana → control}/symbols/call.svg +0 -0
  56. data/cockpit/themes/{diana → control}/symbols/callmanipulate.svg +0 -0
  57. data/cockpit/themes/{diana → control}/symbols/choose.svg +0 -0
  58. data/cockpit/themes/{diana → control}/symbols/choose_exclusive.svg +0 -0
  59. data/cockpit/themes/{diana → control}/symbols/choose_inclusive.svg +0 -0
  60. data/cockpit/themes/{diana → control}/symbols/closed_loop.svg +0 -0
  61. data/cockpit/themes/{diana → control}/symbols/closed_loop_cancel.svg +0 -0
  62. data/cockpit/themes/{diana → control}/symbols/closed_loop_control.svg +0 -0
  63. data/cockpit/themes/{diana → control}/symbols/closed_loop_measuring.svg +0 -0
  64. data/cockpit/themes/{diana → control}/symbols/complex.svg +0 -0
  65. data/cockpit/themes/{diana → control}/symbols/critical.svg +0 -0
  66. data/cockpit/themes/{diana → control}/symbols/end.svg +0 -0
  67. data/cockpit/themes/{diana → control}/symbols/escape.svg +0 -0
  68. data/cockpit/themes/{diana → control}/symbols/event_end.svg +0 -0
  69. data/cockpit/themes/{diana → control}/symbols/loop.svg +0 -0
  70. data/cockpit/themes/{diana → control}/symbols/manipulate.svg +0 -0
  71. data/cockpit/themes/{diana → control}/symbols/otherwise.svg +0 -0
  72. data/cockpit/themes/{diana → control}/symbols/parallel.svg +0 -0
  73. data/cockpit/themes/{diana → control}/symbols/parallel_branch.svg +0 -0
  74. data/cockpit/themes/{diana → control}/symbols/parallel_branch_compact.svg +0 -0
  75. data/cockpit/themes/{diana → control}/symbols/parallel_branch_event.svg +0 -0
  76. data/cockpit/themes/{diana → control}/symbols/parallel_branch_normal.svg +0 -0
  77. data/cockpit/themes/{diana → control}/symbols/scripts.svg +0 -0
  78. data/cockpit/themes/{diana → control}/symbols/start.svg +0 -0
  79. data/cockpit/themes/{diana → control}/symbols/stop.svg +0 -0
  80. data/cockpit/themes/{diana → control}/symbols/terminate.svg +0 -0
  81. data/cockpit/themes/{diana → control}/theme.js +74 -28
  82. data/cockpit/themes/default/rngs/call.rng +93 -41
  83. data/cockpit/themes/default/rngs/callmanipulate.rng +113 -40
  84. data/cockpit/themes/default/theme.js +1318 -0
  85. data/cockpit/themes/extended/rngs/call.rng +93 -41
  86. data/cockpit/themes/extended/rngs/callmanipulate.rng +113 -40
  87. data/cockpit/themes/extended/theme.js +50 -19
  88. data/cockpit/themes/model/rngs/call.rng +21 -20
  89. data/cockpit/themes/model/rngs/callmanipulate.rng +23 -22
  90. data/cockpit/themes/model/theme.js +51 -20
  91. data/cockpit/themes/packed/rngs/call.rng +93 -41
  92. data/cockpit/themes/packed/rngs/callmanipulate.rng +113 -40
  93. data/cockpit/themes/packed/theme.js +50 -19
  94. data/cockpit/themes/preset/rngs/call.rng +93 -41
  95. data/cockpit/themes/preset/rngs/callmanipulate.rng +113 -40
  96. data/cockpit/themes/preset/theme.js +49 -18
  97. data/cockpit/track.html +3 -10
  98. data/cockpit/transformations.xml +4 -0
  99. data/cpee.gemspec +2 -2
  100. data/lib/callbacks.xml +5 -0
  101. data/lib/cpee/controller.rb +30 -28
  102. data/lib/cpee/implementation_callbacks.rb +60 -0
  103. data/lib/cpee/implementation_notifications.rb +6 -2
  104. data/server/handlerwrappers/default.rb +17 -5
  105. data/server/resources/notifications/logging/subscription.xml +6 -0
  106. data/server/resources/transformation_dslx.xsl +1 -1
  107. data/server/routing/end.pid +1 -0
  108. data/server/routing/end.rb +1 -0
  109. data/server/routing/forward-events.pid +1 -0
  110. data/server/routing/forward-votes.pid +1 -0
  111. data/server/routing/forward-votes.rb +6 -5
  112. data/server/routing/persist.pid +1 -0
  113. data/server/routing/persist.rb +4 -4
  114. data/server/server.pid +1 -0
  115. metadata +63 -50
  116. data/cockpit/edit.html +0 -1
  117. data/cockpit/themes/diana/rngs/call.rng +0 -122
  118. data/cockpit/themes/diana/rngs/callmanipulate.rng +0 -145
data/cockpit/js/replay.js ADDED
@@ -0,0 +1,40 @@
1
+ $(document).ready(function() {
2
+ $("#replay button").click(e => {
3
+ $.ajax({
4
+ url: $('#replay input').val(),
5
+ type: 'GET',
6
+ success: function(re) {
7
+ var de;
8
+ var ep;
9
+ var at;
10
+ var desc;
11
+ try {
12
+ jsyaml.loadAll(re,e => {
13
+ if (e.event && e.event['cpee:lifecycle:transition'] == 'dataelements/change') {
14
+ de = e.event.data.data_values;
15
+ }
16
+ if (e.event && e.event['cpee:lifecycle:transition'] == 'endpoints/change') {
17
+ ep = e.event.data.data_values;
18
+ }
19
+ if (e.event && e.event['cpee:lifecycle:transition'] == 'attributes/change') {
20
+ at = e.event.data.data_values;
21
+ }
22
+ if (e.event && e.event['cpee:description']) {
23
+ desc = e.event['cpee:description'];
24
+ }
25
+ if (e.event && e.event['cpee:state'] == 'running') {
26
+ throw BreakException;
27
+ }
28
+ });
29
+ } catch(e) { /* just to break out of the iterator. what a shitty language */ }
30
+ }
31
+ });
32
+
33
+
34
+ // load log with ajax
35
+ // extract process model
36
+ // initialize process model
37
+ // set attributes
38
+ // change start button to do replay
39
+ });
40
+ });
data/cockpit/js/ui.js CHANGED
@@ -102,3 +102,10 @@ $(document).on('paste', '[contenteditable]', function (e) {
102
102
  document.execCommand('insertText', false, content);
103
103
  }
104
104
  });
105
+
106
+ // unmark if storage changes. shit has potentially been copied or marked in other tabs.
107
+ $(window).bind('storage', function (e) {
108
+ if (localStorage.getItem('marked_from') != myid) {
109
+ save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
110
+ }
111
+ });
data/cockpit/model.html CHANGED
@@ -36,11 +36,11 @@
36
36
 
37
37
  <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
38
38
 
39
- <script type="text/javascript" src="/js_libs/ui.js"></script>
39
+ <script type="text/javascript" src="/js_libs/uidash.js"></script>
40
40
  <script type="text/javascript" src="/js_libs/custommenu.js"></script>
41
41
 
42
42
  <link rel="stylesheet" href="/js_libs/custommenu.css" type="text/css"/>
43
- <link rel="stylesheet" href="/js_libs/ui.css" type="text/css"/>
43
+ <link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
44
44
 
45
45
  <link rel="stylesheet" href="/js_libs/relaxngui.css" type="text/css"/>
46
46
 
@@ -54,14 +54,16 @@
54
54
  <script type="text/javascript" src="js/details.js"></script>
55
55
  <script type="text/javascript" src="js/parameters.js"></script>
56
56
  <script type="text/javascript" src="js/model.js"></script>
57
+ <script type="text/javascript" src="js/edit.js"></script>
57
58
  <link rel="stylesheet" href="css/ui.css" type="text/css"/>
58
59
  <link rel="stylesheet" href="css/model.css" type="text/css"/>
60
+ <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
59
61
  <style>
60
62
  /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
61
63
  /* shit balls, no elegance is left in this world */
62
64
  </style>
63
65
  </head>
64
- <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
66
+ <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
65
67
  <div id='disclaimer' class='hidden'> <!--{{{-->
66
68
  <h1>Disclaimer</h1>
67
69
 
@@ -119,7 +121,8 @@
119
121
  <ui-tab class="switch" ></ui-tab>
120
122
  <ui-tab class="" data-tab="model" id="tabmodel" >Model</ui-tab>
121
123
  <ui-tab class="inactive" data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
122
- <ui-behind ><button title='add entry' class="hidden">New</button></ui-behind>
124
+ <ui-behind ></ui-behind>
125
+ <ui-last ><a class="logo" href=".."></a></ui-last>
123
126
  </ui-tabbar>
124
127
  <ui-content>
125
128
  <ui-area data-belongs-to-tab="model" id="areamodel"> <!--{{{-->
@@ -158,6 +161,7 @@
158
161
  </div>
159
162
  </ui-area> <!--}}}-->
160
163
  <ui-area data-belongs-to-tab="dataelements" id="areadataelements" class="inactive"> <!--{{{-->
164
+ <button title='add entry'><span>New</span></button>
161
165
  <div id="dat_dataelements"></div>
162
166
  </ui-area> <!--}}}-->
163
167
  </ui-content>
data/cockpit/replay.html ADDED
@@ -0,0 +1,53 @@
1
+ <!--
2
+ This file is part of CPEE.
3
+
4
+ CPEE is free software: you can redistribute it and/or modify it under the terms
5
+ of the GNU General Public License as published by the Free Software Foundation,
6
+ either version 3 of the License, or (at your option) any later version.
7
+
8
+ CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
9
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
10
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
11
+
12
+ You should have received a copy of the GNU General Public License along with
13
+ CPEE (file COPYING in the main directory). If not, see
14
+ <http://www.gnu.org/licenses/>.
15
+ -->
16
+
17
+ <!DOCTYPE html>
18
+ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
19
+ <head>
20
+ <meta charset="utf-8"/>
21
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
22
+ <title>CPEE Cockpit</title>
23
+
24
+ <!-- libs, do not modify. When local than load local libs. -->
25
+ <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
26
+ <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
27
+ <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
28
+ <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
29
+ <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
30
+ <script type="text/javascript" src="/js_libs/util.js"></script>
31
+ <script type="text/javascript" src="/js_libs/printf.js"></script>
32
+ <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
33
+ <script type="text/javascript" src="/js_libs/parsequery.js"></script>
34
+ <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
35
+ <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
36
+ <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
37
+ <script type="text/javascript" src="/js_libs/js-yaml.min.js"></script>
38
+
39
+ <script type="text/javascript" src="/js_libs/uidash.js"></script>
40
+ <link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
41
+
42
+ <!-- custom stuff, play arround -->
43
+ <script type="text/javascript" src="js/replay.js"></script>
44
+ <link rel="stylesheet" href="css/ui.css" type="text/css"/>
45
+ <link rel="stylesheet" href="css/replay.css" type="text/css"/>
46
+ </head>
47
+ <body is="x-ui-">
48
+ <div id="replayer">
49
+ <div id="replay"><span>Replay:</span><input type="text" value="http://localhost/logs/4b92138d-1f68-4d18-b676-92fb1cbe2c78.xes.yaml"/><button>Prepare!</button></div>
50
+ <iframe id="content" src=""></iframe>
51
+ </div>
52
+ </body>
53
+ </html>
data/cockpit/templates/Coopis 2010.xml CHANGED
@@ -73,4 +73,4 @@ data.costs += result.value('costs').to_f</finalize>
73
73
  <dataelements type="rest"/>
74
74
  <endpoints type="rest"/>
75
75
  </transformation>
76
- </testset>
76
+ </testset>
data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml CHANGED
@@ -74,4 +74,4 @@
74
74
  <dataelements type="rest"/>
75
75
  <endpoints type="rest"/>
76
76
  </transformation>
77
- </testset>
77
+ </testset>
data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml CHANGED
@@ -74,4 +74,4 @@
74
74
  <dataelements type="rest"/>
75
75
  <endpoints type="rest"/>
76
76
  </transformation>
77
- </testset>
77
+ </testset>
data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml CHANGED
@@ -74,4 +74,4 @@
74
74
  <dataelements type="rest"/>
75
75
  <endpoints type="rest"/>
76
76
  </transformation>
77
- </testset>
77
+ </testset>
data/cockpit/templates/Track Test Local.xml CHANGED
@@ -73,10 +73,14 @@
73
73
  <endpoints type="none"/>
74
74
  </transformation>
75
75
  <attributes>
76
- <info>Track Test</info>
76
+ <info>Track Test Local</info>
77
77
  <modeltype>CPEE</modeltype>
78
78
  <theme>default</theme>
79
79
  <customer>pilotfabrik</customer>
80
80
  <status>development</status>
81
+ <creator>Christine Ashcreek</creator>
82
+ <author>Christine Ashcreek</author>
83
+ <design_stage>development</design_stage>
84
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
81
85
  </attributes>
82
- </testset>
86
+ </testset>
data/cockpit/templates/Track Test.xml CHANGED
@@ -78,5 +78,9 @@
78
78
  <theme>default</theme>
79
79
  <customer>pilotfabrik</customer>
80
80
  <status>development</status>
81
+ <creator>Christine Ashcreek</creator>
82
+ <author>Christine Ashcreek</author>
83
+ <design_stage>development</design_stage>
84
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
81
85
  </attributes>
82
- </testset>
86
+ </testset>
data/cockpit/templates/UR-VUE 2020 Manual Adjust.xml CHANGED
@@ -178,5 +178,9 @@ data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y'])
178
178
  <modeltype>CPEE</modeltype>
179
179
  <theme>preset</theme>
180
180
  <resource>ur51</resource>
181
+ <creator>Christine Ashcreek</creator>
182
+ <author>Christine Ashcreek</author>
183
+ <design_stage>development</design_stage>
184
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
181
185
  </attributes>
182
- </testset>
186
+ </testset>
data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml CHANGED
@@ -5,9 +5,9 @@
5
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
6
  <handlers>
7
7
  <handler url="http://tango.wst.univie.ac.at:9332">
8
- <votes topic='state'>change</votes>
9
- <events topic='state'>change</events>
10
- <events topic='task'>instantiation</events>
8
+ <votes topic="state">change</votes>
9
+ <events topic="state">change</events>
10
+ <events topic="task">instantiation</events>
11
11
  </handler>
12
12
  </handlers>
13
13
  <endpoints>
@@ -199,5 +199,9 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
199
199
  <modeltype>CPEE</modeltype>
200
200
  <theme>preset</theme>
201
201
  <resource>ur51</resource>
202
+ <creator>Christine Ashcreek</creator>
203
+ <author>Christine Ashcreek</author>
204
+ <design_stage>development</design_stage>
205
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
202
206
  </attributes>
203
- </testset>
207
+ </testset>
data/cockpit/templates/UR-VUE 2020 Solution NN.xml CHANGED
@@ -5,9 +5,9 @@
5
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
6
  <handlers>
7
7
  <handler url="http://tango.wst.univie.ac.at:9332">
8
- <votes topic='state'>change</votes>
9
- <events topic='state'>change</events>
10
- <events topic='task'>instantiation</events>
8
+ <votes topic="state">change</votes>
9
+ <events topic="state">change</events>
10
+ <events topic="task">instantiation</events>
11
11
  </handler>
12
12
  </handlers>
13
13
  <endpoints>
@@ -193,5 +193,9 @@ data.item = result[0]</finalize>
193
193
  <modeltype>CPEE</modeltype>
194
194
  <theme>preset</theme>
195
195
  <resource>ur51</resource>
196
+ <creator>Christine Ashcreek</creator>
197
+ <author>Christine Ashcreek</author>
198
+ <design_stage>development</design_stage>
199
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
196
200
  </attributes>
197
- </testset>
201
+ </testset>
data/cockpit/templates/UR-VUE 2020 Solution View.xml CHANGED
@@ -3,9 +3,9 @@
3
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
4
4
  <handlers>
5
5
  <handler url="http://tango.wst.univie.ac.at:9332">
6
- <votes topic='state'>change</votes>
7
- <events topic='state'>change</events>
8
- <events topic='task'>instantiation</events>
6
+ <votes topic="state">change</votes>
7
+ <events topic="state">change</events>
8
+ <events topic="task">instantiation</events>
9
9
  </handler>
10
10
  </handlers>
11
11
  <endpoints>
@@ -147,5 +147,9 @@ data.item = result[0]</finalize>
147
147
  <modeltype>CPEE</modeltype>
148
148
  <theme>preset</theme>
149
149
  <resource>ur51</resource>
150
+ <creator>Christine Ashcreek</creator>
151
+ <author>Christine Ashcreek</author>
152
+ <design_stage>development</design_stage>
153
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
150
154
  </attributes>
151
- </testset>
155
+ </testset>
data/cockpit/templates/UR-VUE 2020.xml CHANGED
@@ -2,9 +2,9 @@
2
2
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
3
3
  <handlers>
4
4
  <handler url="http://tango.wst.univie.ac.at:9332">
5
- <votes topic='state'>change</votes>
6
- <events topic='state'>change</events>
7
- <events topic='task'>instantiation</events>
5
+ <votes topic="state">change</votes>
6
+ <events topic="state">change</events>
7
+ <events topic="task">instantiation</events>
8
8
  </handler>
9
9
  </handlers>
10
10
  <endpoints>
@@ -22,5 +22,9 @@
22
22
  </endpoints>
23
23
  <attributes>
24
24
  <resource>ur51</resource>
25
+ <creator>Christine Ashcreek</creator>
26
+ <author>Christine Ashcreek</author>
27
+ <design_stage>development</design_stage>
28
+ <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
25
29
  </attributes>
26
- </testset>
30
+ </testset>
data/cockpit/templates/instantiate.local/Take_Sub.xml CHANGED
@@ -15,7 +15,7 @@
15
15
  <method>:post</method>
16
16
  <arguments>
17
17
  <behavior>wait_running</behavior>
18
- <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url
18
+ <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url>
19
19
  <init/>
20
20
  <endpoints/>
21
21
  <stream/>
data/cockpit/themes/compact/rngs/call.rng CHANGED
@@ -26,7 +26,8 @@
26
26
  </zeroOrMore>
27
27
  </element>
28
28
  <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
29
- <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
29
+
30
+ <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
30
31
  <zeroOrMore rngui:label="Add Sensor">
31
32
  <element name="sensor">
32
33
  <element name="name" rngui:label="Label">
@@ -35,13 +36,18 @@
35
36
  <element name="extractor_url" rngui:label="Extractor Url">
36
37
  <data type="string" rngui:label="Service Url"/>
37
38
  </element>
38
- <element name="extractor_arg" rngui:label="Extractor Argument">
39
- <data type="string" rngui:label="Value / Json"/>
39
+ <element name="extractor_params" rngui:label="Extractor Arguments:">
40
+ <zeroOrMore rngui:label="Create Extractor Argument Pairs">
41
+ <element rngui:label="Name">
42
+ <anyName/>
43
+ <data type="string" rngui:label="Value / Json"/>
44
+ </element>
45
+ </zeroOrMore>
40
46
  </element>
41
47
  <element name="visualizer_url" rngui:label="Visualizer Url">
42
48
  <data type="string" rngui:label="Service Url"/>
43
49
  </element>
44
- <element name="visualizer_params" rngui:header="Visualizer Arguments">
50
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
45
51
  <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
46
52
  <element rngui:label="Name">
47
53
  <anyName/>
@@ -52,44 +58,46 @@
52
58
  </element>
53
59
  </zeroOrMore>
54
60
  </element>
55
- <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
56
- <zeroOrMore rngui:label="Add Aggregator">
57
- <element name="aggregator">
58
- <element name="name" rngui:label="Label">
59
- <data type="string" rngui:label="Label"/>
60
- </element>
61
- <element name="aggregator_url" rngui:label="Aggregator Url">
62
- <data type="string" rngui:label="Service Url"/>
63
- </element>
64
- <element name="aggregator_arg" rngui:label="Aggregator Argument">
65
- <data type="string" rngui:label="Value / Json"/>
66
- </element>
67
- </element>
68
- </zeroOrMore>
69
- </element>
70
- <element name="costs" rngui:header="Costs" rngui:fold="closed">
71
- <zeroOrMore rngui:label="Create Cost Factor">
72
- <element name="cost_factor">
61
+
62
+ <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
63
+ <zeroOrMore rngui:label="Add Impact Profile">
64
+ <element name="ip">
73
65
  <element name="name" rngui:label="Label">
74
66
  <data type="string" rngui:label="Label"/>
75
67
  </element>
76
68
  <element name="target" rngui:label="Target Value">
77
69
  <data type="string" rngui:label="Value"/>
78
70
  </element>
79
- <element name="vfunc_url" rngui:label="Violation Function Url">
80
- <data type="string" rngui:label="Service Url"/>
81
- </element>
82
- <element name="vfunc_arg" rngui:label="Violation Function Argument">
83
- <data type="string" rngui:label="Service Url"/>
71
+ <element name="ifs" rngui:header="Impact Factors">
72
+ <zeroOrMore rngui:label="Add Impact Factor">
73
+ <element name="if">
74
+ <element name="ivs" rngui:header="Impact Values">
75
+ <zeroOrMore rngui:label="Add Impact Value ">
76
+ <element name="iv">
77
+ <element name="extractor_url" rngui:label="Extractor Url">
78
+ <data type="string" rngui:label="Service Url + Parameters"/>
79
+ </element>
80
+ <element name="aggregator_url" rngui:label="Aggregator Url">
81
+ <data type="string" rngui:label="Service Url + Parameters"/>
82
+ </element>
83
+ </element>
84
+ </zeroOrMore>
85
+ </element>
86
+ <element name="aggregator_url" rngui:label="Impact Function Url">
87
+ <data type="string" rngui:label="Service Url + Parameters"/>
88
+ </element>
89
+ </element>
90
+ </zeroOrMore>
84
91
  </element>
85
- <element name="vcost" rngui:label="Violation Cost">
86
- <data type="string" rngui:label="Value"/>
92
+ <element name="vfunc_url" rngui:label="Violation Function Url">
93
+ <data type="string" rngui:label="Service Url + Parameters"/>
87
94
  </element>
88
95
  </element>
89
96
  </zeroOrMore>
90
97
  </element>
98
+
91
99
  </element>
92
- <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
100
+ <element name="report" rngui:header="Reporting" rngui:fold="closed">
93
101
  <element name="url" rngui:label='HTML Snippet'>
94
102
  <data type="string" rngui:label="url to report snippet"/>
95
103
  </element>
@@ -97,21 +105,40 @@
97
105
  </element>
98
106
  <element name="annotations" rngui:header="Annotations">
99
107
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
100
- <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
101
- <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
102
- </element>
103
- <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
104
- <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
105
- </element>
106
- <element name="_timing_min" rngui:label="Min in min">
107
- <data type="float" rngui:label="Minutes"/>
108
- </element>
109
- <element name="_timing_max" rngui:label="Max in min">
110
- <data type="float" rngui:label="Minutes"/>
108
+ <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
109
+ <data type="float" rngui:label="[0,1]"/>
111
110
  </element>
112
111
  <element name="_timing_avg" rngui:label="Avg in min">
113
112
  <data type="float" rngui:label="Minutes"/>
114
113
  </element>
114
+ <element name="explanations" rngui:header="Explanations">
115
+ <zeroOrMore rngui:label="Add Explanation">
116
+ <element name="explanation">
117
+ <element name="type" rngui:label="Type">
118
+ <choice>
119
+ <value>&gt;</value>
120
+ <value>&lt;</value>
121
+ </choice>
122
+ </element>
123
+ <element name="deviation" rngui:label="Deviation">
124
+ <data type="float" rngui:label="Minutes"/>
125
+ </element>
126
+ <element name="behaviour" rngui:label="Behaviour">
127
+ <choice>
128
+ <value>Immediately</value>
129
+ <value>Wait until next</value>
130
+ <value>Use grace period value</value>
131
+ </choice>
132
+ </element>
133
+ <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
134
+ <data type="float" rngui:label="Minutes"/>
135
+ </element>
136
+ <element name="text" rngui:label="Explanation">
137
+ <data type="string" rngui:label="Patterns"/>
138
+ </element>
139
+ </element>
140
+ </zeroOrMore>
141
+ </element>
115
142
  </element>
116
143
  <element name="_notes" rngui:header="Notes" rngui:fold="closed">
117
144
  <element name="_notes_general" rngui:label="General">
@@ -119,4 +146,29 @@
119
146
  </element>
120
147
  </element>
121
148
  </element>
149
+ <element name="input" rngui:header="Input Arguments Documentation" rngui:fold="closed">
150
+ <zeroOrMore rngui:label="Create Argument">
151
+ <element name="item" rngui:label="Description">
152
+ <attribute name="label" rngui:label="Name">
153
+ <data type="string"/>
154
+ </attribute>
155
+ <text rngui:wrap="true" rngui:label="What does it do?"/>
156
+ </element>
157
+ </zeroOrMore>
158
+ </element>
159
+ <element name="output" rngui:header="Output Elements Documentation" rngui:fold="closed">
160
+ <zeroOrMore rngui:label="Create Element">
161
+ <element name="item" rngui:label="Description">
162
+ <attribute name="label" rngui:label="Name">
163
+ <data type="string"/>
164
+ </attribute>
165
+ <text rngui:wrap="true" rngui:label="What does it do?"/>
166
+ </element>
167
+ </zeroOrMore>
168
+ </element>
169
+ <element name="implementation" rngui:header="Implementation Documentation" rngui:fold="closed">
170
+ <element name="description" rngui:label="Description">
171
+ <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
172
+ </element>
173
+ </element>
122
174
  </element>