diff --git a/dlg-graphs/B_process_each_source.graph b/dlg-graphs/B_process_each_source.graph index 29bd0820..68602d2d 100644 --- a/dlg-graphs/B_process_each_source.graph +++ b/dlg-graphs/B_process_each_source.graph @@ -44,7 +44,7 @@ { "name": "num_of_copies", "value": 5, - "defaultValue": "1", + "defaultValue": "5", "description": "Specifies the number of replications that will be generated of the scatter construct's contents.", "readonly": false, "type": "Integer", @@ -73,10 +73,55 @@ } ], "inputAppFields": [ + { + "name": "num_of_copies", + "value": 5, + "defaultValue": "5", + "description": "Specifies the number of replications of the content of the scatter construct", + "readonly": false, + "type": "Integer", + "precious": false, + "options": [], + "positional": false, + "keyAttribute": false, + "id": "2cd5d83b-f3bf-4849-b0bd-3b71c429ee1a", + "parameterType": "ConstructParameter", + "usage": "NoPort" + }, + { + "name": "group_start", + "value": false, + "defaultValue": "False", + "description": "Is this node the start of a group?", + "readonly": false, + "type": "Boolean", + "precious": false, + "options": [], + "positional": false, + "keyAttribute": false, + "id": "e18142c8-c1ba-4e87-a897-5f49b5892ae7", + "parameterType": "ComponentParameter", + "usage": "NoPort" + }, + { + "name": "n_tries", + "value": 1, + "defaultValue": "1", + "description": "Specifies the number of times the 'run' method will be executed before finally giving up", + "readonly": false, + "type": "Integer", + "precious": false, + "options": [], + "positional": false, + "keyAttribute": false, + "id": "6972ee2e-b186-4962-8a69-7fa5673e655a", + "parameterType": "ComponentParameter", + "usage": "NoPort" + }, { "name": "dropclass", - "value": "dlg.apps.simple.PickOne", - "defaultValue": "dlg.apps.simple.PickOne", + "value": "dlg.apps.simple.GenericScatterApp", + "defaultValue": "dlg.apps.simple.GenericScatterApp", "description": "Application class", "readonly": false, "type": "String", @@ -84,7 +129,7 @@ "options": [], "positional": false, "keyAttribute": false, - "id": "9120a87a-72f5-4c24-9588-ae3ec445bf3c", + "id": "20296207-d586-49d5-a781-5e8572799bd1", "parameterType": "ComponentParameter", "usage": "NoPort" }, @@ -106,7 +151,7 @@ ], "positional": false, "keyAttribute": false, - "id": "d4f7a76c-64b0-410b-ad0c-b23920a9d2b7", + "id": "0b99a185-2a9b-402d-a500-1698d5ecc9f1", "parameterType": "ApplicationArgument", "usage": "NoPort" }, @@ -128,7 +173,7 @@ ], "positional": false, "keyAttribute": false, - "id": "1f2caff8-360e-4533-891c-69329a69a95f", + "id": "a84162c1-6d66-4cfa-b790-228796758820", "parameterType": "ApplicationArgument", "usage": "NoPort" }, @@ -143,7 +188,7 @@ "options": [], "positional": false, "keyAttribute": false, - "id": "5fc67993-b79b-4009-ba23-a3314b706dfc", + "id": "4fefc20e-5185-4488-9231-fecf7847583a", "parameterType": "ConstraintParameter", "usage": "NoPort" }, @@ -158,61 +203,46 @@ "options": [], "positional": false, "keyAttribute": false, - "id": "80b0609f-606f-4d7e-b108-e69e006644ba", + "id": "07bc24e7-6a76-42c2-a9b6-7bf99b52701b", "parameterType": "ConstraintParameter", "usage": "NoPort" }, { - "name": "group_start", - "value": false, - "defaultValue": "False", - "description": "Is this node the start of a group?", - "readonly": false, - "type": "Boolean", - "precious": false, - "options": [], - "positional": false, - "keyAttribute": false, - "id": "c0fb94de-05f8-49d6-9547-7f53a21ceb00", - "parameterType": "ComponentParameter", - "usage": "NoPort" - }, - { - "name": "source_list", + "name": "array_in", "value": "", "defaultValue": "", - "description": "List of elements", + "description": "A numpy array of arrays, where the first axis is of length ", "readonly": false, - "type": "Object.array", + "type": "Object.Array", "precious": false, "options": [], "positional": false, "keyAttribute": false, - "id": "f9aeedd2-03fd-44f6-bb9f-072f4079caf2", + "id": "a212eafa-20ec-4d9f-b9ec-0b3e8f21f9e5", "parameterType": "ApplicationArgument", "usage": "InputPort" }, { - "name": "source", + "name": "array_out", "value": "", "defaultValue": "", - "description": "Port carrying the first element of input array", + "description": "Port carrying the reduced array", "readonly": false, - "type": "Object.element", + "type": "Object.Array", "precious": false, "options": [], "positional": false, "keyAttribute": false, - "id": "f1ce3daf-bed6-43ec-8818-680fe7094692", + "id": "249e7909-7b83-4126-ae54-a9b7b362f15a", "parameterType": "ApplicationArgument", "usage": "OutputPort" } ], "outputAppFields": [], - "inputApplicationName": "PickOne", + "inputApplicationName": "GenericScatterApp", "inputApplicationType": "PythonApp", "inputApplicationKey": -3, - "inputApplicationDescription": "App that picks the first element of an input list, passes that to all outputs, except the first one. The first output is used to pass the remaining array on. This app is useful for a loop.", + "inputApplicationDescription": "An APP that splits about any object that can be converted to a numpy array into as many parts as the app has outputs, provided that the initially converted numpy array has enough elements. The return will be a numpy array of arrays, where the first axis is of length len(outputs). The modulo remainder of the length of the original array and the number of outputs will be distributed across the first len(outputs)-1 elements of the resulting array.", "outputApplicationName": "", "outputApplicationType": "None", "outputApplicationKey": null, @@ -577,8 +607,8 @@ "key": -2, "name": "source_list", "description": "In-memory storage of intermediate data products. \n- List of lists. \n- Format: [ ['Source1', '05h30m00s', '40d30m00s', 100], [...], [...], [...], [...] ]", - "x": 485.9627741087308, - "y": 392.7039303606033, + "x": 501.6257234195299, + "y": 398.232030117356, "radius": 25, "collapsed": true, "subject": null, @@ -669,7 +699,7 @@ "defaultValue": "", "description": "", "readonly": false, - "type": "Object", + "type": "Object.Array", "precious": false, "options": [], "positional": false, @@ -699,8 +729,8 @@ "key": -4, "name": "File", "description": "A standard file on a filesystem mounted to the deployment machine", - "x": 812.6902452930725, - "y": 401.63929873543515, + "x": 792.5953463707517, + "y": 404.78249754382307, "radius": 25, "collapsed": false, "subject": null, @@ -822,7 +852,7 @@ "defaultValue": "", "description": "Dummy port", "readonly": false, - "type": "Object.element", + "type": "Object.Array", "precious": false, "options": [], "positional": false, @@ -855,28 +885,28 @@ "closesLoop": false }, { - "from": -2, - "fromPort": "faf822c0-15a8-49a7-9426-6993678d4d9c", - "to": -1, - "toPort": "f9aeedd2-03fd-44f6-bb9f-072f4079caf2", + "from": -4, + "fromPort": "1a14be3c-80ab-4e8c-a202-1754b99541d9", + "to": -22, + "toPort": "b3a6bc47-e690-45a3-95a4-4a5f703bad5e", "dataType": "Object", "loop_aware": "0", "closesLoop": false }, { "from": -1, - "fromPort": "f1ce3daf-bed6-43ec-8818-680fe7094692", + "fromPort": "249e7909-7b83-4126-ae54-a9b7b362f15a", "to": -4, "toPort": "1a14be3c-80ab-4e8c-a202-1754b99541d9", - "dataType": "Object.element", + "dataType": "Object.Array", "loop_aware": "0", "closesLoop": false }, { - "from": -4, - "fromPort": "1a14be3c-80ab-4e8c-a202-1754b99541d9", - "to": -22, - "toPort": "b3a6bc47-e690-45a3-95a4-4a5f703bad5e", + "from": -2, + "fromPort": "faf822c0-15a8-49a7-9426-6993678d4d9c", + "to": -1, + "toPort": "a212eafa-20ec-4d9f-b9ec-0b3e8f21f9e5", "dataType": "Object", "loop_aware": "0", "closesLoop": false