cpee 1.5.27 → 2.0.5

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 (357) hide show
  1. checksums.yaml +4 -4
  2. data/{FEATURES → FEATURES.md} +7 -6
  3. data/INSTALL.md +1 -0
  4. data/{README → README.md} +3 -3
  5. data/Rakefile +1 -0
  6. data/cockpit/index.html +7 -7
  7. data/cockpit/js/details.js +13 -14
  8. data/cockpit/js/instance.js +191 -284
  9. data/cockpit/js/parameters.js +13 -3
  10. data/cockpit/js/ui.js +2 -2
  11. data/cockpit/model.html +1 -0
  12. data/cockpit/rngs/attributes.rng +1 -1
  13. data/cockpit/rngs/dataelements.rng +1 -1
  14. data/cockpit/rngs/endpoints.rng +1 -1
  15. data/cockpit/templates.legacy/Async.xml +7 -7
  16. data/cockpit/templates.legacy/BCO.xml +7 -10
  17. data/cockpit/templates.legacy/BCS.xml +7 -10
  18. data/cockpit/templates.legacy/Centurio.xml +6 -6
  19. data/cockpit/templates.legacy/Concurrent.xml +6 -6
  20. data/cockpit/templates.legacy/Coopis Testset.xml +6 -6
  21. data/cockpit/templates.legacy/Endpoints and Data Manipulation.xml +6 -6
  22. data/cockpit/templates.legacy/ICSOC Testset.xml +6 -6
  23. data/cockpit/templates.legacy/Infinity.xml +3 -3
  24. data/cockpit/templates.legacy/Lego Boxer.xml +7 -7
  25. data/cockpit/templates.legacy/Lego Conveyor.xml +7 -7
  26. data/cockpit/templates.legacy/Lego Crane.xml +7 -7
  27. data/cockpit/templates.legacy/Lego Ejector.xml +7 -7
  28. data/cockpit/templates.legacy/Lego Full.xml +7 -7
  29. data/cockpit/templates.legacy/Lego Liddy.xml +7 -7
  30. data/cockpit/templates.legacy/Lego Plate.xml +7 -7
  31. data/cockpit/templates.legacy/Lego Transporter.xml +7 -7
  32. data/cockpit/templates.legacy/Lego_Part_1.xml +7 -7
  33. data/cockpit/templates.legacy/LgLinear.xml +6 -10
  34. data/cockpit/templates.legacy/Linear.xml +7 -7
  35. data/cockpit/templates.legacy/Log.xml +7 -7
  36. data/cockpit/templates.legacy/Mangler 1.xml +6 -6
  37. data/cockpit/templates.legacy/Mangler 2.xml +6 -6
  38. data/cockpit/templates.legacy/Manuel Labels.xml +7 -7
  39. data/cockpit/templates.legacy/Promise.xml +7 -7
  40. data/cockpit/templates.legacy/SOPROMO Test Sonification.xml +6 -6
  41. data/cockpit/templates.legacy/Subprocess.xml +56 -0
  42. data/cockpit/templates.legacy/Syncing P34 1.xml +8 -11
  43. data/cockpit/templates.legacy/Syncing P34 2.xml +8 -11
  44. data/cockpit/templates.legacy/Syncing P34 3.xml +8 -11
  45. data/cockpit/templates.legacy/Syncing P34.xml +8 -11
  46. data/cockpit/templates.legacy/TEST - Bad Loop.xml +6 -6
  47. data/cockpit/templates.legacy/TEST - Wrong Positions.xml +6 -6
  48. data/cockpit/templates.legacy/Take_5.xml +48 -0
  49. data/cockpit/templates.legacy/Update.xml +7 -7
  50. data/cockpit/templates.legacy/Worklist Parallel.xml +7 -7
  51. data/cockpit/templates.legacy/Worklist Test CPEE.xml +7 -7
  52. data/cockpit/templates.legacy/Worklist Test.xml +7 -7
  53. data/cockpit/templates.legacy/Worklist Test2.xml +7 -7
  54. data/cockpit/templates.legacy/convert_cpee2.rb +15 -0
  55. data/cockpit/templates.legacy/testsets.xml +1 -1
  56. data/cockpit/templates/BPM 2020 Manual Adjust.xml +18 -71
  57. data/cockpit/templates/BPM 2020 Solution Baseline.xml +17 -71
  58. data/cockpit/templates/BPM 2020 Solution NN.xml +25 -71
  59. data/cockpit/templates/BPM 2020 Solution View.xml +15 -71
  60. data/cockpit/templates/BPM 2020.xml +17 -6
  61. data/cockpit/templates/Coopis 2010.xml +7 -7
  62. data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml +7 -10
  63. data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml +7 -10
  64. data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml +7 -10
  65. data/cockpit/templates/Worklist.xml +7 -7
  66. data/cockpit/templates/convert_cpee2.rb +15 -0
  67. data/cockpit/themes/compact/rngs/alternative.rng +25 -0
  68. data/cockpit/themes/compact/rngs/call.rng +17 -17
  69. data/cockpit/themes/compact/rngs/callmanipulate.rng +26 -26
  70. data/cockpit/themes/compact/rngs/choose.rng +14 -0
  71. data/cockpit/themes/compact/rngs/critical.rng +5 -0
  72. data/cockpit/themes/compact/rngs/escape.rng +1 -0
  73. data/cockpit/themes/compact/rngs/group.rng +3 -0
  74. data/cockpit/themes/compact/rngs/loop.rng +22 -0
  75. data/cockpit/themes/compact/rngs/manipulate.rng +9 -0
  76. data/cockpit/themes/compact/rngs/otherwise.rng +22 -0
  77. data/cockpit/themes/compact/rngs/parallel.rng +21 -0
  78. data/cockpit/themes/compact/rngs/parallel_branch.rng +8 -0
  79. data/cockpit/themes/compact/rngs/scripts.rng +10 -11
  80. data/cockpit/themes/compact/rngs/stop.rng +5 -0
  81. data/cockpit/themes/compact/rngs/terminate.rng +1 -0
  82. data/cockpit/themes/convert_cpee2.rb +8 -0
  83. data/cockpit/themes/default/rngs/alternative.rng +8 -8
  84. data/cockpit/themes/default/rngs/call.rng +84 -48
  85. data/cockpit/themes/default/rngs/callmanipulate.rng +103 -64
  86. data/cockpit/themes/default/rngs/choose.rng +5 -3
  87. data/cockpit/themes/default/rngs/critical.rng +2 -2
  88. data/cockpit/themes/default/rngs/escape.rng +1 -1
  89. data/cockpit/themes/default/rngs/group.rng +3 -3
  90. data/cockpit/themes/default/rngs/loop.rng +8 -8
  91. data/cockpit/themes/default/rngs/manipulate.rng +3 -3
  92. data/cockpit/themes/default/rngs/otherwise.rng +8 -8
  93. data/cockpit/themes/default/rngs/parallel.rng +14 -6
  94. data/cockpit/themes/default/rngs/parallel_branch.rng +2 -2
  95. data/cockpit/themes/default/rngs/scripts.rng +23 -0
  96. data/cockpit/themes/default/rngs/stop.rng +2 -2
  97. data/cockpit/themes/default/rngs/terminate.rng +1 -1
  98. data/cockpit/themes/extended/rngs/alternative.rng +25 -0
  99. data/cockpit/themes/extended/rngs/call.rng +17 -17
  100. data/cockpit/themes/extended/rngs/callmanipulate.rng +26 -26
  101. data/cockpit/themes/extended/rngs/choose.rng +14 -0
  102. data/cockpit/themes/extended/rngs/critical.rng +5 -0
  103. data/cockpit/themes/extended/rngs/escape.rng +1 -0
  104. data/cockpit/themes/extended/rngs/group.rng +3 -0
  105. data/cockpit/themes/extended/rngs/loop.rng +22 -0
  106. data/cockpit/themes/extended/rngs/manipulate.rng +9 -0
  107. data/cockpit/themes/extended/rngs/otherwise.rng +22 -0
  108. data/cockpit/themes/extended/rngs/parallel.rng +21 -0
  109. data/cockpit/themes/extended/rngs/parallel_branch.rng +8 -0
  110. data/cockpit/themes/extended/rngs/scripts.rng +10 -11
  111. data/cockpit/themes/extended/rngs/stop.rng +5 -0
  112. data/cockpit/themes/extended/rngs/terminate.rng +1 -0
  113. data/cockpit/themes/extended/theme.js +7 -6
  114. data/cockpit/themes/model/rngs/alternative.rng +1 -1
  115. data/cockpit/themes/model/rngs/call.rng +16 -16
  116. data/cockpit/themes/model/rngs/callmanipulate.rng +17 -17
  117. data/cockpit/themes/model/rngs/choose.rng +1 -1
  118. data/cockpit/themes/model/rngs/critical.rng +1 -1
  119. data/cockpit/themes/model/rngs/escape.rng +1 -1
  120. data/cockpit/themes/model/rngs/group.rng +1 -1
  121. data/cockpit/themes/model/rngs/loop.rng +1 -1
  122. data/cockpit/themes/model/rngs/manipulate.rng +1 -1
  123. data/cockpit/themes/model/rngs/otherwise.rng +1 -1
  124. data/cockpit/themes/model/rngs/parallel.rng +1 -1
  125. data/cockpit/themes/model/rngs/parallel_branch.rng +1 -1
  126. data/cockpit/themes/model/rngs/scripts.rng +3 -4
  127. data/cockpit/themes/model/rngs/stop.rng +1 -1
  128. data/cockpit/themes/model/rngs/terminate.rng +1 -1
  129. data/cockpit/themes/model/theme.js +7 -6
  130. data/cockpit/themes/packed/rngs/alternative.rng +25 -0
  131. data/cockpit/themes/packed/rngs/call.rng +17 -17
  132. data/cockpit/themes/packed/rngs/callmanipulate.rng +26 -26
  133. data/cockpit/themes/packed/rngs/choose.rng +14 -0
  134. data/cockpit/themes/packed/rngs/critical.rng +5 -0
  135. data/cockpit/themes/packed/rngs/escape.rng +1 -0
  136. data/cockpit/themes/packed/rngs/group.rng +3 -0
  137. data/cockpit/themes/packed/rngs/loop.rng +22 -0
  138. data/cockpit/themes/packed/rngs/manipulate.rng +9 -0
  139. data/cockpit/themes/packed/rngs/otherwise.rng +22 -0
  140. data/cockpit/themes/packed/rngs/parallel.rng +21 -0
  141. data/cockpit/themes/packed/rngs/parallel_branch.rng +8 -0
  142. data/cockpit/themes/packed/rngs/scripts.rng +10 -11
  143. data/cockpit/themes/packed/rngs/stop.rng +5 -0
  144. data/cockpit/themes/packed/rngs/terminate.rng +1 -0
  145. data/cockpit/themes/packed/theme.js +7 -6
  146. data/cockpit/themes/preset/rngs/alternative.rng +25 -0
  147. data/cockpit/themes/preset/rngs/call.rng +17 -17
  148. data/cockpit/themes/preset/rngs/callmanipulate.rng +26 -26
  149. data/cockpit/themes/preset/rngs/choose.rng +14 -0
  150. data/cockpit/themes/preset/rngs/critical.rng +5 -0
  151. data/cockpit/themes/preset/rngs/escape.rng +1 -0
  152. data/cockpit/themes/preset/rngs/group.rng +3 -0
  153. data/cockpit/themes/preset/rngs/loop.rng +22 -0
  154. data/cockpit/themes/preset/rngs/manipulate.rng +9 -0
  155. data/cockpit/themes/preset/rngs/otherwise.rng +22 -0
  156. data/cockpit/themes/preset/rngs/parallel.rng +21 -0
  157. data/cockpit/themes/preset/rngs/parallel_branch.rng +8 -0
  158. data/cockpit/themes/preset/rngs/scripts.rng +10 -11
  159. data/cockpit/themes/preset/rngs/stop.rng +5 -0
  160. data/cockpit/themes/preset/rngs/terminate.rng +1 -0
  161. data/cockpit/themes/preset/theme.js +7 -6
  162. data/cpee.gemspec +10 -11
  163. data/{log/topics.xml → lib/callbacks.xml} +16 -6
  164. data/lib/{engine → callbacks}/callbacks.rng +2 -8
  165. data/lib/cpee.xml +10 -4
  166. data/lib/cpee/attributes_helper.rb +27 -0
  167. data/lib/cpee/controller.rb +113 -596
  168. data/lib/cpee/implementation.rb +167 -191
  169. data/lib/cpee/implementation_callbacks.rb +77 -0
  170. data/lib/cpee/implementation_notifications.rb +189 -0
  171. data/lib/cpee/implementation_properties.rb +714 -0
  172. data/lib/cpee/{callback.rb → message.rb} +20 -18
  173. data/lib/cpee/persistence.rb +135 -0
  174. data/lib/cpee/statemachine.rb +20 -0
  175. data/lib/cpee/transform.rb +95 -0
  176. data/lib/engine.xml +1 -59
  177. data/lib/properties.xml +236 -0
  178. data/lib/properties/arbitrary.rng +26 -0
  179. data/lib/properties/attributes.rng +10 -0
  180. data/lib/properties/dataelements.rng +10 -0
  181. data/lib/properties/description.rng +8 -0
  182. data/lib/properties/dsl.rng +7 -0
  183. data/lib/properties/dslx.rng +8 -0
  184. data/lib/properties/endpoints.rng +10 -0
  185. data/lib/properties/handlerwrapper.rng +9 -0
  186. data/lib/properties/position.rng +15 -0
  187. data/lib/properties/positions.rng +10 -0
  188. data/lib/properties/properties.rng +29 -0
  189. data/lib/properties/set-properties.rng +25 -0
  190. data/lib/properties/set-some-properties.rng +45 -0
  191. data/lib/properties/simple.rng +8 -0
  192. data/lib/properties/state.rng +33 -0
  193. data/lib/properties/status.rng +12 -0
  194. data/lib/properties/t_attributes.rng +7 -0
  195. data/lib/properties/t_dataelements.rng +7 -0
  196. data/lib/properties/t_endpoints.rng +7 -0
  197. data/lib/properties/t_position.rng +7 -0
  198. data/lib/properties/t_positions.rng +7 -0
  199. data/lib/properties/t_simple.rng +7 -0
  200. data/lib/properties/t_status.rng +7 -0
  201. data/lib/properties/t_transformation.rng +7 -0
  202. data/lib/properties/transformation.rng +40 -0
  203. data/server/dev.rb +1 -0
  204. data/server/handlerwrappers/default.rb +40 -38
  205. data/server/resources/backend/README.md +17 -0
  206. data/server/resources/backend/instance.rb +23 -0
  207. data/server/resources/backend/instance.template +19 -0
  208. data/server/resources/backend/opts.yaml +6 -0
  209. data/server/resources/backend/run +33 -0
  210. data/server/resources/notifications/logging/subscription.xml +19 -0
  211. data/server/resources/properties.empty +38 -0
  212. data/server/resources/properties.init +11 -11
  213. data/server/resources/states.dot +19 -0
  214. data/server/resources/states.xml +49 -0
  215. data/server/routing/end.rb +44 -0
  216. data/server/routing/forward-events.rb +59 -0
  217. data/server/routing/forward-votes.rb +108 -0
  218. data/server/routing/persist.rb +155 -0
  219. data/server/server.rb +1 -0
  220. data/tools/cpee +46 -16
  221. data/tools/instantiation/instantiation +0 -1
  222. data/tools/server/server.rb +0 -1
  223. metadata +78 -133
  224. data/INSTALL +0 -23
  225. data/cockpit/templates/convert_preset.rb +0 -32
  226. data/cockpit/templates/testsets.xml +0 -11
  227. data/cockpit/templates/transformations.xml +0 -4
  228. data/cockpit/themes/compact/rngs/alternative.rng +0 -1
  229. data/cockpit/themes/compact/rngs/choose.rng +0 -1
  230. data/cockpit/themes/compact/rngs/critical.rng +0 -1
  231. data/cockpit/themes/compact/rngs/escape.rng +0 -1
  232. data/cockpit/themes/compact/rngs/group.rng +0 -1
  233. data/cockpit/themes/compact/rngs/loop.rng +0 -1
  234. data/cockpit/themes/compact/rngs/manipulate.rng +0 -1
  235. data/cockpit/themes/compact/rngs/otherwise.rng +0 -1
  236. data/cockpit/themes/compact/rngs/parallel.rng +0 -1
  237. data/cockpit/themes/compact/rngs/parallel_branch.rng +0 -1
  238. data/cockpit/themes/compact/rngs/stop.rng +0 -1
  239. data/cockpit/themes/compact/rngs/terminate.rng +0 -1
  240. data/cockpit/themes/default/rngs/finalize.rng +0 -6
  241. data/cockpit/themes/default/rngs/update.rng +0 -6
  242. data/cockpit/themes/default/theme.js +0 -1286
  243. data/cockpit/themes/extended/rngs/alternative.rng +0 -1
  244. data/cockpit/themes/extended/rngs/choose.rng +0 -1
  245. data/cockpit/themes/extended/rngs/critical.rng +0 -1
  246. data/cockpit/themes/extended/rngs/escape.rng +0 -1
  247. data/cockpit/themes/extended/rngs/group.rng +0 -1
  248. data/cockpit/themes/extended/rngs/loop.rng +0 -1
  249. data/cockpit/themes/extended/rngs/manipulate.rng +0 -1
  250. data/cockpit/themes/extended/rngs/otherwise.rng +0 -1
  251. data/cockpit/themes/extended/rngs/parallel.rng +0 -1
  252. data/cockpit/themes/extended/rngs/parallel_branch.rng +0 -1
  253. data/cockpit/themes/extended/rngs/stop.rng +0 -1
  254. data/cockpit/themes/extended/rngs/terminate.rng +0 -1
  255. data/cockpit/themes/labels/rngs/alternative.rng +0 -25
  256. data/cockpit/themes/labels/rngs/call.rng +0 -81
  257. data/cockpit/themes/labels/rngs/callmanipulate.rng +0 -101
  258. data/cockpit/themes/labels/rngs/choose.rng +0 -12
  259. data/cockpit/themes/labels/rngs/critical.rng +0 -5
  260. data/cockpit/themes/labels/rngs/escape.rng +0 -1
  261. data/cockpit/themes/labels/rngs/finalize.rng +0 -6
  262. data/cockpit/themes/labels/rngs/group.rng +0 -3
  263. data/cockpit/themes/labels/rngs/loop.rng +0 -22
  264. data/cockpit/themes/labels/rngs/manipulate.rng +0 -9
  265. data/cockpit/themes/labels/rngs/otherwise.rng +0 -22
  266. data/cockpit/themes/labels/rngs/parallel.rng +0 -13
  267. data/cockpit/themes/labels/rngs/parallel_branch.rng +0 -8
  268. data/cockpit/themes/labels/rngs/stop.rng +0 -5
  269. data/cockpit/themes/labels/rngs/terminate.rng +0 -1
  270. data/cockpit/themes/labels/rngs/update.rng +0 -6
  271. data/cockpit/themes/labels/symbols/alternative.svg +0 -5
  272. data/cockpit/themes/labels/symbols/arrow.svg +0 -3
  273. data/cockpit/themes/labels/symbols/call.svg +0 -6
  274. data/cockpit/themes/labels/symbols/callmanipulate.svg +0 -8
  275. data/cockpit/themes/labels/symbols/choose.svg +0 -5
  276. data/cockpit/themes/labels/symbols/choose_exclusive.svg +0 -5
  277. data/cockpit/themes/labels/symbols/choose_inclusive.svg +0 -4
  278. data/cockpit/themes/labels/symbols/complex.svg +0 -8
  279. data/cockpit/themes/labels/symbols/critical.svg +0 -4
  280. data/cockpit/themes/labels/symbols/end.svg +0 -3
  281. data/cockpit/themes/labels/symbols/escape.svg +0 -5
  282. data/cockpit/themes/labels/symbols/event_end.svg +0 -3
  283. data/cockpit/themes/labels/symbols/loop.svg +0 -5
  284. data/cockpit/themes/labels/symbols/manipulate.svg +0 -4
  285. data/cockpit/themes/labels/symbols/otherwise.svg +0 -5
  286. data/cockpit/themes/labels/symbols/parallel.svg +0 -5
  287. data/cockpit/themes/labels/symbols/parallel_branch.svg +0 -5
  288. data/cockpit/themes/labels/symbols/parallel_branch_compact.svg +0 -4
  289. data/cockpit/themes/labels/symbols/parallel_branch_event.svg +0 -14
  290. data/cockpit/themes/labels/symbols/parallel_branch_normal.svg +0 -5
  291. data/cockpit/themes/labels/symbols/scripts.svg +0 -4
  292. data/cockpit/themes/labels/symbols/start.svg +0 -3
  293. data/cockpit/themes/labels/symbols/stop.svg +0 -5
  294. data/cockpit/themes/labels/symbols/terminate.svg +0 -4
  295. data/cockpit/themes/packed/rngs/alternative.rng +0 -1
  296. data/cockpit/themes/packed/rngs/choose.rng +0 -1
  297. data/cockpit/themes/packed/rngs/critical.rng +0 -1
  298. data/cockpit/themes/packed/rngs/escape.rng +0 -1
  299. data/cockpit/themes/packed/rngs/group.rng +0 -1
  300. data/cockpit/themes/packed/rngs/loop.rng +0 -1
  301. data/cockpit/themes/packed/rngs/manipulate.rng +0 -1
  302. data/cockpit/themes/packed/rngs/otherwise.rng +0 -1
  303. data/cockpit/themes/packed/rngs/parallel.rng +0 -1
  304. data/cockpit/themes/packed/rngs/parallel_branch.rng +0 -1
  305. data/cockpit/themes/packed/rngs/stop.rng +0 -1
  306. data/cockpit/themes/packed/rngs/terminate.rng +0 -1
  307. data/cockpit/themes/preset/rngs/alternative.rng +0 -1
  308. data/cockpit/themes/preset/rngs/choose.rng +0 -1
  309. data/cockpit/themes/preset/rngs/critical.rng +0 -1
  310. data/cockpit/themes/preset/rngs/escape.rng +0 -1
  311. data/cockpit/themes/preset/rngs/group.rng +0 -1
  312. data/cockpit/themes/preset/rngs/loop.rng +0 -1
  313. data/cockpit/themes/preset/rngs/manipulate.rng +0 -1
  314. data/cockpit/themes/preset/rngs/otherwise.rng +0 -1
  315. data/cockpit/themes/preset/rngs/parallel.rng +0 -1
  316. data/cockpit/themes/preset/rngs/parallel_branch.rng +0 -1
  317. data/cockpit/themes/preset/rngs/stop.rng +0 -1
  318. data/cockpit/themes/preset/rngs/terminate.rng +0 -1
  319. data/lib/cpee/empty_workflow.rb +0 -28
  320. data/lib/cpee/handler_notifications.rb +0 -47
  321. data/lib/cpee/handler_properties.rb +0 -50
  322. data/lib/cpee/instantiation.rb +0 -369
  323. data/lib/cpee/processtransformation/bpel/Repository/booking.bpel +0 -125
  324. data/lib/cpee/processtransformation/bpel/Repository/booking.wsdl +0 -72
  325. data/lib/cpee/processtransformation/bpel/Repository/booking/airline.wsdl +0 -71
  326. data/lib/cpee/processtransformation/bpel/Repository/booking/hotel.wsdl +0 -64
  327. data/lib/cpee/processtransformation/bpel/Repository/booking/report.wsdl +0 -71
  328. data/lib/cpee/processtransformation/bpel/bpel2wee.rb +0 -34
  329. data/lib/cpee/processtransformation/bpel/bpelserver.ru +0 -64
  330. data/lib/cpee/processtransformation/bpel/bpelserver.xml +0 -70
  331. data/lib/cpee/processtransformation/bpel/lib/BPEL_Transform.rb +0 -367
  332. data/lib/cpee/processtransformation/bpmn2.rb +0 -297
  333. data/lib/cpee/processtransformation/cpee.rb +0 -119
  334. data/lib/cpee/processtransformation/structures.rb +0 -465
  335. data/lib/cpee/processtransformation/target.rb +0 -50
  336. data/log/azure.rb +0 -10
  337. data/log/azure_logger.rb +0 -136
  338. data/log/chain.xml +0 -27
  339. data/log/elasticsearch.rb +0 -15
  340. data/log/elasticsearch_logging.rb +0 -377
  341. data/log/legacy/test_es.rb +0 -26
  342. data/log/legacy/test_split.rb +0 -211
  343. data/log/log.xml +0 -13
  344. data/log/non_tamp.rb +0 -156
  345. data/log/sic.rb +0 -64
  346. data/log/template.xes_xml +0 -23
  347. data/log/template.xes_yaml +0 -28
  348. data/log/trace.yaml +0 -17717
  349. data/log/trace_sic.yaml +0 -18343
  350. data/log/xes_xml.rb +0 -121
  351. data/log/xes_yaml.rb +0 -96
  352. data/server/handlerwrappers/soap.rb +0 -146
  353. data/server/resources/properties.schema.active +0 -139
  354. data/server/resources/properties.schema.finished +0 -139
  355. data/server/resources/properties.schema.inactive +0 -136
  356. data/server/transformation_dslx.xsl +0 -790
  357. data/test/callback.rb +0 -9
@@ -1,14 +1,14 @@
1
1
  <testset>
2
- <dataelements>
2
+ <dataelements xmlns="http://cpee.org/ns/properties/2.0">
3
3
  <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
4
  </dataelements>
5
- <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
- <endpoints>
5
+ <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints xmlns="http://cpee.org/ns/properties/2.0">
7
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
8
8
  <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9302</worklist>
9
9
  </endpoints>
10
- <positions/>
11
- <description>
10
+ <positions xmlns="http://cpee.org/ns/properties/2.0"/>
11
+ <description xmlns="http://cpee.org/ns/properties/2.0">
12
12
  <description xmlns="http://cpee.org/ns/description/1.0">
13
13
  <call id="a1" endpoint="worklist">
14
14
  <parameters>
@@ -27,12 +27,12 @@
27
27
  </call>
28
28
  </description>
29
29
  </description>
30
- <transformation>
30
+ <transformation xmlns="http://cpee.org/ns/properties/2.0">
31
31
  <description type="copy"/>
32
32
  <dataelements type="none"/>
33
33
  <endpoints type="none"/>
34
34
  </transformation>
35
- <attributes>
35
+ <attributes xmlns="http://cpee.org/ns/properties/2.0">
36
36
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
37
37
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
38
38
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
@@ -1,14 +1,14 @@
1
1
  <testset>
2
- <dataelements>
2
+ <dataelements xmlns="http://cpee.org/ns/properties/2.0">
3
3
  <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
4
  </dataelements>
5
- <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
- <endpoints>
5
+ <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints xmlns="http://cpee.org/ns/properties/2.0">
7
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
8
8
  <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9398</worklist>
9
9
  </endpoints>
10
- <positions/>
11
- <description>
10
+ <positions xmlns="http://cpee.org/ns/properties/2.0"/>
11
+ <description xmlns="http://cpee.org/ns/properties/2.0">
12
12
  <description xmlns="http://cpee.org/ns/description/1.0">
13
13
  <call id="a1" endpoint="worklist">
14
14
  <parameters>
@@ -29,12 +29,12 @@
29
29
  </call>
30
30
  </description>
31
31
  </description>
32
- <transformation>
32
+ <transformation xmlns="http://cpee.org/ns/properties/2.0">
33
33
  <description type="copy"/>
34
34
  <dataelements type="none"/>
35
35
  <endpoints type="none"/>
36
36
  </transformation>
37
- <attributes>
37
+ <attributes xmlns="http://cpee.org/ns/properties/2.0">
38
38
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
39
39
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
40
40
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
@@ -1,14 +1,14 @@
1
1
  <testset>
2
- <dataelements>
2
+ <dataelements xmlns="http://cpee.org/ns/properties/2.0">
3
3
  <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
4
  </dataelements>
5
- <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
- <endpoints>
5
+ <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
6
+ <endpoints xmlns="http://cpee.org/ns/properties/2.0">
7
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
8
8
  <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</worklist>
9
9
  </endpoints>
10
- <positions/>
11
- <description>
10
+ <positions xmlns="http://cpee.org/ns/properties/2.0"/>
11
+ <description xmlns="http://cpee.org/ns/properties/2.0">
12
12
  <description xmlns="http://cpee.org/ns/description/1.0">
13
13
  <call id="a1" endpoint="worklist">
14
14
  <parameters>
@@ -30,12 +30,12 @@
30
30
  </call>
31
31
  </description>
32
32
  </description>
33
- <transformation>
33
+ <transformation xmlns="http://cpee.org/ns/properties/2.0">
34
34
  <description type="copy"/>
35
35
  <dataelements type="none"/>
36
36
  <endpoints type="none"/>
37
37
  </transformation>
38
- <attributes>
38
+ <attributes xmlns="http://cpee.org/ns/properties/2.0">
39
39
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
40
40
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
41
41
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
@@ -0,0 +1,15 @@
1
+ #!/usr/bin/ruby
2
+ require 'xml/smart'
3
+
4
+ Dir['*.xml'].each do |f|
5
+ XML::Smart.modify(f) do |doc|
6
+ doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
7
+ doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
8
+ if doc.root.qname.name == 'testset'
9
+ doc.find('//attributes | //endpoints | //dataelements | //positions | //transformation | //handlerwrapper | //description').each do |e|
10
+ e.namespaces[nil] = 'http://cpee.org/ns/properties/2.0'
11
+ e.namespace = nil
12
+ end
13
+ end
14
+ end
15
+ end
@@ -34,4 +34,4 @@
34
34
  <testset>Lego Liddy</testset>
35
35
  <testset>Lego Full</testset>
36
36
  <!--testset>Manuel Labels</testset-->
37
- </testsets>
37
+ </testsets>
@@ -1,17 +1,16 @@
1
- <testset>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
2
  <dataelements/>
3
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
4
4
  <endpoints>
5
- <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
6
- <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
7
- <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
8
- <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
9
- <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
10
- <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
11
- <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
12
- <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
13
- <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
14
- <move_rel xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/relative</move_rel>
5
+ <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
6
+ <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
7
+ <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
8
+ <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
9
+ <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
10
+ <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
11
+ <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
12
+ <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
13
+ <move_rel>http-put://ryloth.wst.univie.ac.at:9329/move/position/relative</move_rel>
15
14
  </endpoints>
16
15
  <description>
17
16
  <description xmlns="http://cpee.org/ns/description/1.0">
@@ -28,8 +27,8 @@
28
27
  <code>
29
28
  <prepare/>
30
29
  <finalize output="result">data.direction_first = result
31
- data.direction_first['x'] = data.direction_first['dir_x'] * 10
32
- data.direction_first['y'] = data.direction_first['dir_y'] * 10</finalize>
30
+ data.direction_first['x'] = data.direction_first['dir_x'] * 6
31
+ data.direction_first['y'] = data.direction_first['dir_y'] * 6</finalize>
33
32
  <update output="result"/>
34
33
  <rescue output="result"/>
35
34
  </code>
@@ -72,32 +71,6 @@ data.direction_first['y'] = data.direction_first['dir_y'] * 10</finalize>
72
71
  </_notes>
73
72
  </annotations>
74
73
  </call>
75
- <call id="a15" endpoint="wait">
76
- <parameters>
77
- <label>Wait for camera stream delay</label>
78
- <method>:post</method>
79
- <arguments>
80
- <timeout>5</timeout>
81
- </arguments>
82
- <stream>
83
- <sensors/>
84
- <aggregators/>
85
- <costs/>
86
- </stream>
87
- </parameters>
88
- <annotations>
89
- <_timing>
90
- <_timing_wait/>
91
- <_timing_threshold/>
92
- <_timing_min/>
93
- <_timing_max/>
94
- <_timing_avg/>
95
- </_timing>
96
- <_notes>
97
- <_notes_general/>
98
- </_notes>
99
- </annotations>
100
- </call>
101
74
  <call id="a17" endpoint="get_offset_base">
102
75
  <parameters>
103
76
  <label>Get second offset and calc distance</label>
@@ -116,7 +89,7 @@ if (data.direction_first['dir_x'] * data.direction_second['dir_x'] &gt;= 0)
116
89
  else
117
90
  data.traveled = data.direction_first['len'] + data.direction_second['len']
118
91
  end
119
- data.len = data.direction_second['len'] / (data.traveled / 10)
92
+ data.len = data.direction_second['len'] / (data.traveled / 6)
120
93
  data.direction_second['x'] = data.direction_second['dir_x'] * data.len
121
94
  data.direction_second['y'] = data.direction_second['dir_y'] * data.len</finalize>
122
95
  <update output="result"/>
@@ -161,32 +134,6 @@ data.direction_second['y'] = data.direction_second['dir_y'] * data.len</finalize
161
134
  </_notes>
162
135
  </annotations>
163
136
  </call>
164
- <call id="a16" endpoint="wait">
165
- <parameters>
166
- <label>Wait for camera stream delay</label>
167
- <method>:post</method>
168
- <arguments>
169
- <timeout>5</timeout>
170
- </arguments>
171
- <stream>
172
- <sensors/>
173
- <aggregators/>
174
- <costs/>
175
- </stream>
176
- </parameters>
177
- <annotations>
178
- <_timing>
179
- <_timing_wait/>
180
- <_timing_threshold/>
181
- <_timing_min/>
182
- <_timing_max/>
183
- <_timing_avg/>
184
- </_timing>
185
- <_notes>
186
- <_notes_general/>
187
- </_notes>
188
- </annotations>
189
- </call>
190
137
  <call id="a2" endpoint="get_offset_base">
191
138
  <parameters>
192
139
  <label>Investigate Precision</label>
@@ -201,7 +148,7 @@ data.direction_second['y'] = data.direction_second['dir_y'] * data.len</finalize
201
148
  <prepare/>
202
149
  <finalize output="result">data.direction_third = result</finalize>
203
150
  <update output="result"/>
204
- <rescue output="result"/>
151
+ <rescue output="result">'Oh no!'</rescue>
205
152
  </code>
206
153
  <annotations>
207
154
  <_timing>
@@ -227,9 +174,9 @@ data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y'])
227
174
  <endpoints type="none"/>
228
175
  </transformation>
229
176
  <attributes>
230
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Manual Adjust</info>
231
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
232
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
233
- <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
177
+ <info>BPM 2020 Manual Adjust</info>
178
+ <modeltype>CPEE</modeltype>
179
+ <theme>preset</theme>
180
+ <resource>ur51</resource>
234
181
  </attributes>
235
182
  </testset>
@@ -1,19 +1,18 @@
1
- <testset>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
2
  <dataelements>
3
- <places xmlns="http://riddl.org/ns/common-patterns/properties/1.0">[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2]]</places>
3
+ <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
4
4
  </dataelements>
5
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
6
  <endpoints>
7
- <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
8
- <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
9
- <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
10
- <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
11
- <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
12
- <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
13
- <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
14
- <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
15
- <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
16
- <subprocess xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9296/url/</subprocess>
7
+ <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
8
+ <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
9
+ <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
10
+ <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
11
+ <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
12
+ <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
13
+ <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
14
+ <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
15
+ <subprocess>http://localhost:9296/url/</subprocess>
17
16
  </endpoints>
18
17
  <description>
19
18
  <description xmlns="http://cpee.org/ns/description/1.0">
@@ -46,32 +45,6 @@
46
45
  </_notes>
47
46
  </annotations>
48
47
  </call>
49
- <call id="a7" endpoint="wait">
50
- <parameters>
51
- <label>Wait for camera stream delay</label>
52
- <method>:post</method>
53
- <arguments>
54
- <timeout>5</timeout>
55
- </arguments>
56
- <stream>
57
- <sensors/>
58
- <aggregators/>
59
- <costs/>
60
- </stream>
61
- </parameters>
62
- <annotations>
63
- <_timing>
64
- <_timing_wait/>
65
- <_timing_threshold/>
66
- <_timing_min/>
67
- <_timing_max/>
68
- <_timing_avg/>
69
- </_timing>
70
- <_notes>
71
- <_notes_general/>
72
- </_notes>
73
- </annotations>
74
- </call>
75
48
  <call id="a3" endpoint="get_items_base">
76
49
  <parameters>
77
50
  <label>Get item positions</label>
@@ -129,39 +102,13 @@
129
102
  </_notes>
130
103
  </annotations>
131
104
  </call>
132
- <call id="a15" endpoint="wait">
133
- <parameters>
134
- <label>Wait for camera stream delay</label>
135
- <method>:post</method>
136
- <arguments>
137
- <timeout>5</timeout>
138
- </arguments>
139
- <stream>
140
- <sensors/>
141
- <aggregators/>
142
- <costs/>
143
- </stream>
144
- </parameters>
145
- <annotations>
146
- <_timing>
147
- <_timing_wait/>
148
- <_timing_threshold/>
149
- <_timing_min/>
150
- <_timing_max/>
151
- <_timing_avg/>
152
- </_timing>
153
- <_notes>
154
- <_notes_general/>
155
- </_notes>
156
- </annotations>
157
- </call>
158
105
  <call id="a2" endpoint="subprocess">
159
106
  <parameters>
160
107
  <label>Adjust</label>
161
108
  <method>:post</method>
162
109
  <arguments>
163
110
  <behavior>wait_running</behavior>
164
- <url>http://cpee.org/~demo/cpee-cockpit/templates/BPM%202020%20Manual%20Adjust.xml</url>
111
+ <url>http://localhost/flow/templates/BPM%202020%20Manual%20Adjust.xml</url>
165
112
  <init/>
166
113
  <endpoints/>
167
114
  <stream/>
@@ -174,7 +121,7 @@
174
121
  </parameters>
175
122
  <code>
176
123
  <prepare/>
177
- <finalize output="result"># data.place = data.places.shift
124
+ <finalize output="result">data.place = data.places.shift
178
125
  data.item = result['item']
179
126
  data.item['x'] = data.items.first['x'] + data.item['adjust_x']
180
127
  data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
@@ -194,7 +141,6 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
194
141
  </_notes>
195
142
  </annotations>
196
143
  </call>
197
- <stop id="a4"/>
198
144
  <call id="a8" endpoint="grip_and_place">
199
145
  <parameters>
200
146
  <label>Grip and Place</label>
@@ -242,9 +188,9 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
242
188
  <endpoints type="none"/>
243
189
  </transformation>
244
190
  <attributes>
245
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Solution Baseline Manual Adjust</info>
246
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
247
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
248
- <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
191
+ <info>BPM 2020 Solution Baseline</info>
192
+ <modeltype>CPEE</modeltype>
193
+ <theme>preset</theme>
194
+ <resource>ur51</resource>
249
195
  </attributes>
250
196
  </testset>
@@ -1,18 +1,24 @@
1
- <testset>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
2
  <dataelements>
3
- <places xmlns="http://riddl.org/ns/common-patterns/properties/1.0">[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2]]</places>
3
+ <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
4
4
  </dataelements>
5
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
6
+ <handlers>
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>
11
+ </handler>
12
+ </handlers>
6
13
  <endpoints>
7
- <overview xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/overview</overview>
8
- <move_tool xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/point</move_tool>
9
- <move_camera xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/position/view</move_camera>
10
- <get_items_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/items</get_items_base>
11
- <get_items_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
12
- <get_offset_base xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://tango.wst.univie.ac.at:9329/view/details</get_offset_base>
13
- <get_offset_neural xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
14
- <wait xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
15
- <grip_and_place xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http-put://tango.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
14
+ <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
15
+ <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
16
+ <move_camera>http-put://ryloth.wst.univie.ac.at:9329/move/position/view</move_camera>
17
+ <get_items_base>http-get://ryloth.wst.univie.ac.at:9329/view/items</get_items_base>
18
+ <get_items_neural>http-get://ryloth.wst.univie.ac.at:9330/view/items</get_items_neural>
19
+ <get_offset_base>http-get://ryloth.wst.univie.ac.at:9329/view/details</get_offset_base>
20
+ <get_offset_neural>http-get://ryloth.wst.univie.ac.at:9330/view/details</get_offset_neural>
21
+ <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
16
22
  </endpoints>
17
23
  <description>
18
24
  <description xmlns="http://cpee.org/ns/description/1.0">
@@ -46,32 +52,6 @@
46
52
  </_notes>
47
53
  </annotations>
48
54
  </call>
49
- <call id="a7" endpoint="wait">
50
- <parameters>
51
- <label>Wait for camera stream delay</label>
52
- <method>:post</method>
53
- <arguments>
54
- <timeout>5</timeout>
55
- </arguments>
56
- <stream>
57
- <sensors/>
58
- <aggregators/>
59
- <costs/>
60
- </stream>
61
- </parameters>
62
- <annotations>
63
- <_timing>
64
- <_timing_wait/>
65
- <_timing_threshold/>
66
- <_timing_min/>
67
- <_timing_max/>
68
- <_timing_avg/>
69
- </_timing>
70
- <_notes>
71
- <_notes_general/>
72
- </_notes>
73
- </annotations>
74
- </call>
75
55
  <call id="a3" endpoint="get_items_neural">
76
56
  <parameters>
77
57
  <label>Get item positions</label>
@@ -130,32 +110,6 @@ data.item = result[0]</finalize>
130
110
  </_notes>
131
111
  </annotations>
132
112
  </call>
133
- <call id="a4" endpoint="wait">
134
- <parameters>
135
- <label>Wait for camera stream delay</label>
136
- <method>:post</method>
137
- <arguments>
138
- <timeout>5</timeout>
139
- </arguments>
140
- <stream>
141
- <sensors/>
142
- <aggregators/>
143
- <costs/>
144
- </stream>
145
- </parameters>
146
- <annotations>
147
- <_timing>
148
- <_timing_wait/>
149
- <_timing_threshold/>
150
- <_timing_min/>
151
- <_timing_max/>
152
- <_timing_avg/>
153
- </_timing>
154
- <_notes>
155
- <_notes_general/>
156
- </_notes>
157
- </annotations>
158
- </call>
159
113
  <call id="a6" endpoint="get_offset_neural">
160
114
  <parameters>
161
115
  <label>Get item offset</label>
@@ -169,8 +123,8 @@ data.item = result[0]</finalize>
169
123
  <code>
170
124
  <prepare/>
171
125
  <finalize output="result">data.adjusted = {
172
- 'x' =&gt; data.item['x'] + result['adjust_x'],
173
- 'y' =&gt; data.item['y'] + result['adjust_y']
126
+ 'x' =&gt; data.item['x'] + result['dir_x'],
127
+ 'y' =&gt; data.item['y'] + result['dir_y']
174
128
  }</finalize>
175
129
  <update output="result"/>
176
130
  <rescue output="result"/>
@@ -192,8 +146,8 @@ data.item = result[0]</finalize>
192
146
  <parameters>
193
147
  <label>Grip and Place</label>
194
148
  <arguments>
195
- <x>!data.adjusted['x']</x>
196
- <y>!data.adjusted['y']</y>
149
+ <x>!data.adjusted['x'].round(0)</x>
150
+ <y>!data.adjusted['y'].round(0)</y>
197
151
  <place_x>!data.place[0]</place_x>
198
152
  <place_y>!data.place[1]</place_y>
199
153
  </arguments>
@@ -235,9 +189,9 @@ data.item = result[0]</finalize>
235
189
  <endpoints type="none"/>
236
190
  </transformation>
237
191
  <attributes>
238
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">BPM 2020 Solution NN</info>
239
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
240
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
241
- <resource xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ur51</resource>
192
+ <info>BPM 2020 Solution NN</info>
193
+ <modeltype>CPEE</modeltype>
194
+ <theme>preset</theme>
195
+ <resource>ur51</resource>
242
196
  </attributes>
243
197
  </testset>