From d65a5b194ed34610bd02982f49e5257bdfd1e9bb Mon Sep 17 00:00:00 2001 From: awicenec Date: Tue, 6 Oct 2020 11:46:56 +0800 Subject: [PATCH] fixed sleep app path --- .../dropmake/logical_graphs/simpleMKN.graph | 484 +++++++++--------- 1 file changed, 242 insertions(+), 242 deletions(-) diff --git a/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph b/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph index 13a23982e..d01a2c541 100644 --- a/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph +++ b/daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph @@ -1,350 +1,350 @@ { - "linkDataArray": [ - { - "from": -3, - "fromPort": "68fc1918-f262-4003-b944-1f76339859e0", - "to": -1, - "toPort": "09874eb2-72bd-4ddb-9727-b700678b18f5" - }, - { - "from": -1, - "fromPort": "efb6a0b8-99d1-4979-b72c-0039c28d0a28", - "to": -4, - "toPort": "ae981288-d839-4890-bb11-f54f336cfad0" - }, - { - "from": -1, - "fromPort": "af2b86b8-7a98-4864-9d0d-08b7ad202fbe", - "to": -2, - "toPort": "c17a6ac4-7c75-423d-ad08-9a35a5918cd4" - }, - { - "from": -2, - "fromPort": "728014ae-a135-4b47-a295-da5884b83310", - "to": -1, - "toPort": "9980ceea-f9c3-40e4-a41b-8964869552d6" - } - ], "modelData": { - "filePath": "Sleep.graph", "fileType": "graph", - "git_url": "", - "repo": "", - "repoBranch": "", - "repoService": "Unknown", - "sha": "" + "repoService": "GitHub", + "repoBranch": "graph_fixes", + "repo": "ICRAR/daliuge", + "filePath": "daliuge-translator/test/dropmake/logical_graphs/simpleMKN.graph", + "sha": "", + "git_url": "" }, "nodeDataArray": [ { - "canHaveInputs": true, - "canHaveOutputs": true, "category": "MKN", "categoryType": "Group", - "collapsed": false, + "isData": false, + "isGroup": true, + "canHaveInputs": true, + "canHaveOutputs": true, "color": "#D32000", - "description": "Placeholder 'mkn' description", "drawOrderHint": 0, + "key": -1, + "text": "MKN", + "description": "Placeholder 'mkn' description", + "x": 941.7277781953355, + "y": 100, + "width": 255.79229031760582, + "height": 252.30527217275548, + "collapsed": false, + "showPorts": true, + "streaming": false, + "subject": null, + "selected": true, + "expanded": true, + "inputApplicationName": "sleep", + "outputApplicationName": "sleep", "exitApplicationName": "", + "inputApplicationType": "PythonApp", + "outputApplicationType": "PythonApp", "exitApplicationType": "None", - "expanded": true, - "fields": [ + "inputPorts": [ { - "description": "", - "name": "m", - "text": "M", - "value": "1" - }, + "Id": "09874eb2-72bd-4ddb-9727-b700678b18f5", + "IdText": "event" + } + ], + "outputPorts": [ { - "description": "", - "name": "k", - "text": "K", - "value": "1" - }, + "Id": "efb6a0b8-99d1-4979-b72c-0039c28d0a28", + "IdText": "event" + } + ], + "inputLocalPorts": [ { - "description": "", - "name": "n", - "text": "N", - "value": "1" + "Id": "9980ceea-f9c3-40e4-a41b-8964869552d6", + "IdText": "event" + } + ], + "outputLocalPorts": [ + { + "Id": "af2b86b8-7a98-4864-9d0d-08b7ad202fbe", + "IdText": "event" } ], - "height": 252.30527217275548, "inputAppFields": [ { - "description": "", - "name": "execution_time", "text": "Execution time", - "value": "5" + "name": "execution_time", + "value": "5", + "description": "" }, { - "description": "", - "name": "num_cpus", "text": "Num CPUs", - "value": "1" + "name": "num_cpus", + "value": "1", + "description": "" }, { - "description": "", - "name": "group_start", "text": "Group start", - "value": "0" + "name": "group_start", + "value": "0", + "description": "" }, { - "description": "", - "name": "appclass", "text": "Appclass", - "value": "dlg.apps.simple.SleepApp" - } - ], - "inputApplicationName": "sleep", - "inputApplicationType": "PythonApp", - "inputLocalPorts": [ - { - "Id": "9980ceea-f9c3-40e4-a41b-8964869552d6", - "IdText": "event" - } - ], - "inputPorts": [ - { - "Id": "09874eb2-72bd-4ddb-9727-b700678b18f5", - "IdText": "event" + "name": "appclass", + "value": "dlg.apps.simple.SleepApp", + "description": "" } ], - "isData": false, - "isGroup": true, - "key": -1, "outputAppFields": [ { - "description": "", - "name": "execution_time", "text": "Execution time", - "value": "5" + "name": "execution_time", + "value": "5", + "description": "" }, { - "description": "", - "name": "num_cpus", "text": "Num CPUs", - "value": "1" + "name": "num_cpus", + "value": "1", + "description": "" }, { - "description": "", - "name": "group_start", "text": "Group start", - "value": "0" + "name": "group_start", + "value": "0", + "description": "" }, { - "description": "", - "name": "appclass", "text": "Appclass", - "value": "dlg.apps.simple.SleepApp" + "name": "appclass", + "value": "dlg.apps.simple.SleepApp", + "description": "" } ], - "outputApplicationName": "sleep", - "outputApplicationType": "PythonApp", - "outputLocalPorts": [ + "fields": [ { - "Id": "af2b86b8-7a98-4864-9d0d-08b7ad202fbe", - "IdText": "event" - } - ], - "outputPorts": [ + "text": "M", + "name": "m", + "value": "1", + "description": "" + }, { - "Id": "efb6a0b8-99d1-4979-b72c-0039c28d0a28", - "IdText": "event" + "text": "K", + "name": "k", + "value": "5", + "description": "" + }, + { + "text": "N", + "name": "n", + "value": "2", + "description": "" } - ], - "selected": true, - "showPorts": true, - "streaming": false, - "subject": null, - "text": "MKN", - "width": 255.79229031760582, - "x": 641.7277781953355, - "y": -81.32494353221887 + ] }, { - "canHaveInputs": true, - "canHaveOutputs": true, "category": "PythonApp", "categoryType": "Application", - "collapsed": false, + "isData": false, + "isGroup": false, + "canHaveInputs": true, + "canHaveOutputs": true, "color": "#3498DB", - "description": "An application component in the form of a Python app", "drawOrderHint": 0, + "key": -2, + "text": "SleepApp", + "description": "An application component in the form of a Python app", + "x": 974.5102787954545, + "y": 236.714399186708, + "width": 200, + "height": 200, + "collapsed": false, + "showPorts": false, + "streaming": false, + "subject": null, + "selected": false, + "expanded": false, + "group": -1, + "inputApplicationName": "", + "outputApplicationName": "", "exitApplicationName": "", + "inputApplicationType": "None", + "outputApplicationType": "None", "exitApplicationType": "None", - "expanded": false, + "inputPorts": [ + { + "Id": "c17a6ac4-7c75-423d-ad08-9a35a5918cd4", + "IdText": "event" + } + ], + "outputPorts": [ + { + "Id": "728014ae-a135-4b47-a295-da5884b83310", + "IdText": "event" + } + ], + "inputLocalPorts": [], + "outputLocalPorts": [], + "inputAppFields": [], + "outputAppFields": [], "fields": [ { - "description": "", - "name": "execution_time", "text": "Execution time", - "value": "5" + "name": "execution_time", + "value": "5", + "description": "" }, { - "description": "", - "name": "num_cpus", "text": "Num CPUs", - "value": "1" + "name": "num_cpus", + "value": "1", + "description": "" }, { - "description": "", - "name": "group_start", "text": "Group start", - "value": "0" + "name": "group_start", + "value": "0", + "description": "" }, { - "description": "", - "name": "appclass", "text": "Appclass", - "value": "test.graphsRepository" + "name": "appclass", + "value": "dlg.apps.simple.SleepApp", + "description": "" }, { - "description": "", - "name": "arg01", "text": "Arg01", - "value": "sleep time=20" - } - ], - "group": -1, - "height": 200, - "inputAppFields": [], - "inputApplicationName": "", - "inputApplicationType": "None", - "inputLocalPorts": [], - "inputPorts": [ - { - "Id": "c17a6ac4-7c75-423d-ad08-9a35a5918cd4", - "IdText": "event" - } - ], - "isData": false, - "isGroup": false, - "key": -2, - "outputAppFields": [], - "outputApplicationName": "", - "outputApplicationType": "None", - "outputLocalPorts": [], - "outputPorts": [ - { - "Id": "728014ae-a135-4b47-a295-da5884b83310", - "IdText": "event" + "name": "arg01", + "value": "sleep time=20", + "description": "" } - ], - "selected": false, - "showPorts": false, - "streaming": false, - "subject": null, - "text": "SleepApp", - "width": 200, - "x": 673.7469200168285, - "y": 55.38945565448913 + ] }, { - "canHaveInputs": true, - "canHaveOutputs": true, "category": "Memory", "categoryType": "Data", - "collapsed": false, + "isData": true, + "isGroup": false, + "canHaveInputs": true, + "canHaveOutputs": true, "color": "#394BB2", - "description": "", "drawOrderHint": 0, - "exitApplicationName": "", - "exitApplicationType": "None", - "expanded": false, - "fields": [ - { - "description": "", - "name": "data_volume", - "text": "Data volume", - "value": "5" - }, - { - "description": "", - "name": "group_end", - "text": "Group end", - "value": "0" - } - ], + "key": -3, + "text": "Memory", + "description": "", + "x": 600, + "y": 281.32494353221887, + "width": 200, "height": 200, - "inputAppFields": [], + "collapsed": false, + "showPorts": false, + "streaming": false, + "subject": null, + "selected": false, + "expanded": false, "inputApplicationName": "", - "inputApplicationType": "None", - "inputLocalPorts": [], - "inputPorts": [], - "isData": true, - "isGroup": false, - "key": -3, - "outputAppFields": [], "outputApplicationName": "", + "exitApplicationName": "", + "inputApplicationType": "None", "outputApplicationType": "None", - "outputLocalPorts": [], + "exitApplicationType": "None", + "inputPorts": [], "outputPorts": [ { "Id": "68fc1918-f262-4003-b944-1f76339859e0", "IdText": "event" } ], - "selected": false, - "showPorts": false, - "streaming": false, - "subject": null, - "text": "Memory", - "width": 200, - "x": 300, - "y": 100 - }, - { - "canHaveInputs": true, - "canHaveOutputs": true, - "category": "Memory", - "categoryType": "Data", - "collapsed": false, - "color": "#394BB2", - "description": "", - "drawOrderHint": 0, - "exitApplicationName": "", - "exitApplicationType": "None", - "expanded": false, + "inputLocalPorts": [], + "outputLocalPorts": [], + "inputAppFields": [], + "outputAppFields": [], "fields": [ { - "description": "", - "name": "data_volume", "text": "Data volume", - "value": "5" + "name": "data_volume", + "value": "5", + "description": "" }, { - "description": "", - "name": "group_end", "text": "Group end", - "value": "0" + "name": "group_end", + "value": "0", + "description": "" } - ], + ] + }, + { + "category": "Memory", + "categoryType": "Data", + "isData": true, + "isGroup": false, + "canHaveInputs": true, + "canHaveOutputs": true, + "color": "#394BB2", + "drawOrderHint": 0, + "key": -4, + "text": "Memory", + "description": "", + "x": 1334.5984891818098, + "y": 204.6105443455109, + "width": 200, "height": 200, - "inputAppFields": [], + "collapsed": false, + "showPorts": false, + "streaming": false, + "subject": null, + "selected": false, + "expanded": false, "inputApplicationName": "", + "outputApplicationName": "", + "exitApplicationName": "", "inputApplicationType": "None", - "inputLocalPorts": [], + "outputApplicationType": "None", + "exitApplicationType": "None", "inputPorts": [ { "Id": "ae981288-d839-4890-bb11-f54f336cfad0", "IdText": "event" } ], - "isData": true, - "isGroup": false, - "key": -4, - "outputAppFields": [], - "outputApplicationName": "", - "outputApplicationType": "None", - "outputLocalPorts": [], "outputPorts": [], - "selected": false, - "showPorts": false, - "streaming": false, - "subject": null, - "text": "Memory", - "width": 200, - "x": 1034.5984891818098, - "y": 23.285600813292042 + "inputLocalPorts": [], + "outputLocalPorts": [], + "inputAppFields": [], + "outputAppFields": [], + "fields": [ + { + "text": "Data volume", + "name": "data_volume", + "value": "5", + "description": "" + }, + { + "text": "Group end", + "name": "group_end", + "value": "0", + "description": "" + } + ] + } + ], + "linkDataArray": [ + { + "from": -3, + "fromPort": "68fc1918-f262-4003-b944-1f76339859e0", + "to": -1, + "toPort": "09874eb2-72bd-4ddb-9727-b700678b18f5" + }, + { + "from": -1, + "fromPort": "efb6a0b8-99d1-4979-b72c-0039c28d0a28", + "to": -4, + "toPort": "ae981288-d839-4890-bb11-f54f336cfad0" + }, + { + "from": -1, + "fromPort": "af2b86b8-7a98-4864-9d0d-08b7ad202fbe", + "to": -2, + "toPort": "c17a6ac4-7c75-423d-ad08-9a35a5918cd4" + }, + { + "from": -2, + "fromPort": "728014ae-a135-4b47-a295-da5884b83310", + "to": -1, + "toPort": "9980ceea-f9c3-40e4-a41b-8964869552d6" } ] } \ No newline at end of file