cpee 2.1.92 → 2.1.95

data/server/routing/forward-events-03.pid

@@ -0,0 +1 @@
+2372984

data/server/routing/forward-events-04.pid

@@ -0,0 +1 @@
+2372990

data/server/routing/forward-events-05.pid

@@ -0,0 +1 @@
+2372996

data/server/routing/forward-events-06.pid

@@ -0,0 +1 @@
+2373002

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-91259
+2372960

data/server/routing/persist.pid

@@ -1 +1 @@
-91253
+2372954

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.92
+  version: 2.1.95
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -208,26 +208,27 @@ files:
 - cockpit/contrib/transformation1.xsl
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
+- cockpit/css/extended_columns-label.css
+- cockpit/css/extended_columns-svg.css
 - cockpit/css/graph.css
 - cockpit/css/llm.css
 - cockpit/css/model.css
-- cockpit/css/resources-label.css
-- cockpit/css/resources-svg.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
+- cockpit/david.html
 - cockpit/edit.html
 - cockpit/graph.html
 - cockpit/index.html
 - cockpit/js/details.js
 - cockpit/js/edit.js
+- cockpit/js/extended_columns.js
 - cockpit/js/instance.js
 - cockpit/js/llm.js
 - cockpit/js/llm_alternative.js
 - cockpit/js/model.js
 - cockpit/js/modifiers.js
 - cockpit/js/parameters.js
-- cockpit/js/resources.js
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
@@ -786,6 +787,128 @@ files:
 - cockpit/themes/preset/symbols/terminate.svg
 - cockpit/themes/preset/symbols/wait_for_signal.svg
 - cockpit/themes/preset/theme.js
+- cockpit/themes/presetaltid/rngs/alternative.rng
+- cockpit/themes/presetaltid/rngs/call.rng
+- cockpit/themes/presetaltid/rngs/callmanipulate.rng
+- cockpit/themes/presetaltid/rngs/choose.rng
+- cockpit/themes/presetaltid/rngs/closed_loop.rng
+- cockpit/themes/presetaltid/rngs/closed_loop_cancel.rng
+- cockpit/themes/presetaltid/rngs/closed_loop_control.rng
+- cockpit/themes/presetaltid/rngs/closed_loop_measuring.rng
+- cockpit/themes/presetaltid/rngs/critical.rng
+- cockpit/themes/presetaltid/rngs/escape.rng
+- cockpit/themes/presetaltid/rngs/group.rng
+- cockpit/themes/presetaltid/rngs/loop.rng
+- cockpit/themes/presetaltid/rngs/manipulate.rng
+- cockpit/themes/presetaltid/rngs/otherwise.rng
+- cockpit/themes/presetaltid/rngs/parallel.rng
+- cockpit/themes/presetaltid/rngs/parallel_branch.rng
+- cockpit/themes/presetaltid/rngs/scripts.rng
+- cockpit/themes/presetaltid/rngs/start.rng
+- cockpit/themes/presetaltid/rngs/stop.rng
+- cockpit/themes/presetaltid/rngs/terminate.rng
+- cockpit/themes/presetaltid/rngs/wait_for_signal.rng
+- cockpit/themes/presetaltid/symbols/alternative.svg
+- cockpit/themes/presetaltid/symbols/arrow.svg
+- cockpit/themes/presetaltid/symbols/call.svg
+- cockpit/themes/presetaltid/symbols/call_sensor.svg
+- cockpit/themes/presetaltid/symbols/callmanipulate.svg
+- cockpit/themes/presetaltid/symbols/callmanipulate_sensor.svg
+- cockpit/themes/presetaltid/symbols/callmanipulate_sensor_signal.svg
+- cockpit/themes/presetaltid/symbols/callmanipulate_signal.svg
+- cockpit/themes/presetaltid/symbols/choose.svg
+- cockpit/themes/presetaltid/symbols/choose_exclusive.svg
+- cockpit/themes/presetaltid/symbols/choose_exclusive_finish.svg
+- cockpit/themes/presetaltid/symbols/choose_inclusive.svg
+- cockpit/themes/presetaltid/symbols/choose_inclusive_finish.svg
+- cockpit/themes/presetaltid/symbols/closed_loop.svg
+- cockpit/themes/presetaltid/symbols/closed_loop_cancel.svg
+- cockpit/themes/presetaltid/symbols/closed_loop_control.svg
+- cockpit/themes/presetaltid/symbols/closed_loop_measuring.svg
+- cockpit/themes/presetaltid/symbols/complex.svg
+- cockpit/themes/presetaltid/symbols/critical.svg
+- cockpit/themes/presetaltid/symbols/delete.svg
+- cockpit/themes/presetaltid/symbols/end.svg
+- cockpit/themes/presetaltid/symbols/escape.svg
+- cockpit/themes/presetaltid/symbols/event_end.svg
+- cockpit/themes/presetaltid/symbols/loop.svg
+- cockpit/themes/presetaltid/symbols/loop_end.svg
+- cockpit/themes/presetaltid/symbols/manipulate.svg
+- cockpit/themes/presetaltid/symbols/otherwise.svg
+- cockpit/themes/presetaltid/symbols/parallel.svg
+- cockpit/themes/presetaltid/symbols/parallel_branch.svg
+- cockpit/themes/presetaltid/symbols/parallel_branch_event.svg
+- cockpit/themes/presetaltid/symbols/parallel_branch_normal.svg
+- cockpit/themes/presetaltid/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/presetaltid/symbols/parallel_eventbased_parallel.svg
+- cockpit/themes/presetaltid/symbols/scripts.svg
+- cockpit/themes/presetaltid/symbols/start.svg
+- cockpit/themes/presetaltid/symbols/start_event.svg
+- cockpit/themes/presetaltid/symbols/stop.svg
+- cockpit/themes/presetaltid/symbols/terminate.svg
+- cockpit/themes/presetaltid/symbols/wait_for_signal.svg
+- cockpit/themes/presetaltid/theme.js
+- cockpit/themes/presetid/rngs/alternative.rng
+- cockpit/themes/presetid/rngs/call.rng
+- cockpit/themes/presetid/rngs/callmanipulate.rng
+- cockpit/themes/presetid/rngs/choose.rng
+- cockpit/themes/presetid/rngs/closed_loop.rng
+- cockpit/themes/presetid/rngs/closed_loop_cancel.rng
+- cockpit/themes/presetid/rngs/closed_loop_control.rng
+- cockpit/themes/presetid/rngs/closed_loop_measuring.rng
+- cockpit/themes/presetid/rngs/critical.rng
+- cockpit/themes/presetid/rngs/escape.rng
+- cockpit/themes/presetid/rngs/group.rng
+- cockpit/themes/presetid/rngs/loop.rng
+- cockpit/themes/presetid/rngs/manipulate.rng
+- cockpit/themes/presetid/rngs/otherwise.rng
+- cockpit/themes/presetid/rngs/parallel.rng
+- cockpit/themes/presetid/rngs/parallel_branch.rng
+- cockpit/themes/presetid/rngs/scripts.rng
+- cockpit/themes/presetid/rngs/start.rng
+- cockpit/themes/presetid/rngs/stop.rng
+- cockpit/themes/presetid/rngs/terminate.rng
+- cockpit/themes/presetid/rngs/wait_for_signal.rng
+- cockpit/themes/presetid/symbols/alternative.svg
+- cockpit/themes/presetid/symbols/arrow.svg
+- cockpit/themes/presetid/symbols/call.svg
+- cockpit/themes/presetid/symbols/call_sensor.svg
+- cockpit/themes/presetid/symbols/callmanipulate.svg
+- cockpit/themes/presetid/symbols/callmanipulate_sensor.svg
+- cockpit/themes/presetid/symbols/callmanipulate_sensor_signal.svg
+- cockpit/themes/presetid/symbols/callmanipulate_signal.svg
+- cockpit/themes/presetid/symbols/choose.svg
+- cockpit/themes/presetid/symbols/choose_exclusive.svg
+- cockpit/themes/presetid/symbols/choose_exclusive_finish.svg
+- cockpit/themes/presetid/symbols/choose_inclusive.svg
+- cockpit/themes/presetid/symbols/choose_inclusive_finish.svg
+- cockpit/themes/presetid/symbols/closed_loop.svg
+- cockpit/themes/presetid/symbols/closed_loop_cancel.svg
+- cockpit/themes/presetid/symbols/closed_loop_control.svg
+- cockpit/themes/presetid/symbols/closed_loop_measuring.svg
+- cockpit/themes/presetid/symbols/complex.svg
+- cockpit/themes/presetid/symbols/critical.svg
+- cockpit/themes/presetid/symbols/delete.svg
+- cockpit/themes/presetid/symbols/end.svg
+- cockpit/themes/presetid/symbols/escape.svg
+- cockpit/themes/presetid/symbols/event_end.svg
+- cockpit/themes/presetid/symbols/loop.svg
+- cockpit/themes/presetid/symbols/loop_end.svg
+- cockpit/themes/presetid/symbols/manipulate.svg
+- cockpit/themes/presetid/symbols/otherwise.svg
+- cockpit/themes/presetid/symbols/parallel.svg
+- cockpit/themes/presetid/symbols/parallel_branch.svg
+- cockpit/themes/presetid/symbols/parallel_branch_event.svg
+- cockpit/themes/presetid/symbols/parallel_branch_normal.svg
+- cockpit/themes/presetid/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/presetid/symbols/parallel_eventbased_parallel.svg
+- cockpit/themes/presetid/symbols/scripts.svg
+- cockpit/themes/presetid/symbols/start.svg
+- cockpit/themes/presetid/symbols/start_event.svg
+- cockpit/themes/presetid/symbols/stop.svg
+- cockpit/themes/presetid/symbols/terminate.svg
+- cockpit/themes/presetid/symbols/wait_for_signal.svg
+- cockpit/themes/presetid/theme.js
 - cockpit/themes/reduced/rngs/alternative.rng
 - cockpit/themes/reduced/rngs/call.rng
 - cockpit/themes/reduced/rngs/callmanipulate.rng
@@ -912,7 +1035,6 @@ files:
 - server/executionhandlers/eval/controller.rb
 - server/executionhandlers/eval/dsl_to_dslx.xsl
 - server/executionhandlers/eval/execution.rb
-- server/executionhandlers/ruby/ShiftingTestSimple.xml
 - server/executionhandlers/ruby/backend/README.md
 - server/executionhandlers/ruby/backend/instance.template
 - server/executionhandlers/ruby/backend/opts.yaml
@@ -931,12 +1053,17 @@ files:
 - server/routing/end.pid
 - server/routing/end.rb
 - server/routing/forward-events-00.pid
+- server/routing/forward-events-01.pid
+- server/routing/forward-events-02.pid
+- server/routing/forward-events-03.pid
+- server/routing/forward-events-04.pid
+- server/routing/forward-events-05.pid
+- server/routing/forward-events-06.pid
 - server/routing/forward-events.rb
 - server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
 - server/routing/persist.pid
 - server/routing/persist.rb
-- server/server.pid
 - tools/cpee
 - tools/server/cpee
 - tools/server/cpee.conf

data/cockpit/js/resources.js

@@ -1,64 +0,0 @@
-function show_label(x,y,deg,text) {
-  const degrees_to_radians = deg => (deg * Math.PI) / 180.0;
-
-  let clone = $('svg',document.querySelector('#label').content.cloneNode(true));
-  $('text',clone).text(text);
-  let n = $('body').append(clone);
-  let dim = $('text',clone)[0].getBBox();
-  let height = $('rect',clone).attr('height');
-  let width = dim.width + dim.x;
-  let shift = (width + 10) * Math.sin(degrees_to_radians(deg));
-  let shift_plus = height * Math.sin(degrees_to_radians(90-deg));
-  let neigh = (width + 10) * Math.cos(degrees_to_radians(deg)) + height * Math.cos(degrees_to_radians(90-deg));
-
-  let top_y = 23 * Math.cos(degrees_to_radians(deg));
-  let top_x = 23 * Math.sin(degrees_to_radians(deg));
-
-  $(clone).css('left',x-top_x);
-  $(clone).css('top',y-shift-top_y);
-
-  $(clone).attr('height',shift + shift_plus + 2);
-  $(clone).attr('width',neigh + 2);
-  $('g',clone).attr('transform',$('g',clone).attr('transform').replace(/%%1/, shift + 1).replace(/%%2/, deg));
-  $('rect',clone).attr('width',width);
-}
-
-function show_row_label(data) {
-  let pos = data.getBoundingClientRect();
-  let pos_top = $('#graphcolumn')[0].getBoundingClientRect();
-  let pos_y;
-  let text = $('text',data).text();
-  if (pos.y < (pos_top.y + 10)) {
-    pos_y = pos_top.y + 10;
-  } else {
-    pos_y = pos.y;
-  }
-  show_label(pos.x + 12, pos_y, 60, text);
-}
-
-$(document).ready(function() {
-  var current_label;
-  $('#graphgrid').on('mouseout','svg .resource-column, svg .resource-point',(data)=>{
-    $('.displaylabel').remove();
-    current_label = undefined;
-  });
-  $('#graphcolumn').scroll((data)=>{
-    if (current_label != undefined) {
-      $('.displaylabel').remove();
-      show_row_label(current_label);
-    }
-  });
-  $('#graphgrid').on('mouseover','svg .resource-column',(data)=>{
-    show_row_label(data.target);
-    current_label = data.target;
-  });
-  $('#graphgrid').on('mouseover','svg .resource-point',(ev)=>{
-    let rc = $(ev.target).attr('resource-column');
-    let data = $('.resource-column[resource-column=' + rc + ']')[0];
-    show_row_label(data);
-    current_label = data;
-    // let pos = data.target.getBoundingClientRect();
-    // let text = $('text',data.target).text();
-    // show_label(pos.x + 12, pos.y + 5, 60, text);
-  });
-});

data/server/executionhandlers/ruby/ShiftingTestSimple.xml

@@ -1,100 +0,0 @@
-    <description xmlns="http://cpee.org/ns/description/1.0">
-      <_generic/>
-      <_shifting>
-        <_shifting_factor>45 minutes</_shifting_factor>
-        <_shifting_start>!data.basedate + ", 12:00"</_shifting_start>
-        <_shifting_modifier>2</_shifting_modifier>
-      </_shifting>
-      <_context_data_analysis>
-        <probes/>
-        <ips/>
-      </_context_data_analysis>
-      <loop mode="pre_test" condition="true">
-        <_probability>
-          <_probability_min/>
-          <_probability_max/>
-          <_probability_avg/>
-        </_probability>
-        <parallel wait="-1" cancel="last">
-          <parallel_branch pass="" local="">
-            <call id="a1" endpoint="send">
-              <parameters>
-                <label>send message</label>
-                <arguments>
-                  <timeout>1</timeout>
-                  <ignore/>
-                </arguments>
-              </parameters>
-              <annotations>
-                <_generic/>
-                <_timing>
-                  <_timing_weight/>
-                  <_timing_avg/>
-                  <explanations/>
-                </_timing>
-                <_shifting>
-                  <_shifting_type>Duration</_shifting_type>
-                  <_shifting_expression>!rand(1.. 3) + " days"</_shifting_expression>
-                </_shifting>
-                <_context_data_analysis>
-                  <probes/>
-                  <ips/>
-                </_context_data_analysis>
-                <report>
-                  <url/>
-                </report>
-                <_notes>
-                  <_notes_general/>
-                </_notes>
-              </annotations>
-              <documentation>
-                <input/>
-                <output/>
-                <implementation>
-                  <description/>
-                </implementation>
-              </documentation>
-            </call>
-          </parallel_branch>
-          <parallel_branch pass="" local="">
-            <call id="a5" endpoint="timeout">
-              <parameters>
-                <label>Wait till 16:00</label>
-                <arguments>
-                  <timeout>2</timeout>
-                </arguments>
-              </parameters>
-              <annotations>
-                <_timing>
-                  <_timing_weight/>
-                  <_timing_avg/>
-                  <explanations/>
-                </_timing>
-                <_shifting>
-                  <_shifting_type>Ends</_shifting_type>
-                  <_shifting_expression>same day, 16:00</_shifting_expression>
-                </_shifting>
-                <_context_data_analysis>
-                  <probes/>
-                  <ips/>
-                </_context_data_analysis>
-                <report>
-                  <url/>
-                </report>
-                <_notes>
-                  <_notes_general/>
-                </_notes>
-              </annotations>
-              <documentation>
-                <input/>
-                <output/>
-                <implementation>
-                  <description/>
-                </implementation>
-              </documentation>
-            </call>
-          </parallel_branch>
-        </parallel>
-        <stop id="a4"/>
-      </loop>
-    </description>

data/server/server.pid

@@ -1 +0,0 @@
-592827