Commit 3b0599ed authored by André Anjos's avatar André Anjos

Merge branch '86_change_loop_parts_name' into 'master'

Change loop parts name

Closes #86

See merge request !85
parents ed24f043 691f5453
Pipeline #32218 passed with stages
in 19 minutes and 6 seconds
......@@ -6,8 +6,8 @@
"oneOf": [
{ "$ref": "2.json#/definitions/block" },
{ "$ref": "2.json#/definitions/analyzer" },
{ "$ref": "#/definitions/loop_user" },
{ "$ref": "#/definitions/loop" }
{ "$ref": "#/definitions/loop_evaluator" },
{ "$ref": "#/definitions/loop_processor" }
],
"definitions": {
......@@ -101,7 +101,7 @@
},
"loop_user": {
"loop_processor": {
"type": "object",
......@@ -116,7 +116,7 @@
"api_version": { "$ref": "common.json#/definitions/api_version" },
"type": {
"type": "string",
"enum": ["sequential_loop_user", "autonomous_loop_user"]
"enum": ["sequential_loop_processor", "autonomous_loop_processor"]
}
},
......@@ -130,7 +130,7 @@
},
"loop": {
"loop_evaluator": {
"type": "object",
......@@ -144,7 +144,7 @@
"api_version": { "$ref": "common.json#/definitions/api_version" },
"type": {
"type": "string",
"enum": ["sequential_loop", "autonomous_loop"]
"enum": ["sequential_loop_evaluator", "autonomous_loop_evaluator"]
}
},
......
......@@ -2,8 +2,8 @@
"schema_version": 3,
"language": "python",
"api_version": 2,
"type": "loop",
"type": "loop_user",
"type": "loop_evaluator",
"type": "loop_processor",
"groups": [
{
"inputs": {
......
......@@ -2,7 +2,7 @@
"schema_version": 3,
"language": "python",
"api_version": 2,
"type": "autonomous_loop",
"type": "autonomous_loop_evaluator",
"groups": [
{
"inputs": {
......
......@@ -2,7 +2,7 @@
"schema_version": 3,
"language": "python",
"api_version": 2,
"type": "autonomous_loop_user",
"type": "autonomous_loop_processor",
"splittable": false,
"groups": [
{
......
......@@ -2,7 +2,7 @@
"schema_version": 3,
"language": "python",
"api_version": 2,
"type": "autonomous_loop",
"type": "autonomous_loop_evaluator",
"groups": [
{
"inputs": {
......
......@@ -2,7 +2,7 @@
"schema_version": 3,
"language": "python",
"api_version": 2,
"type": "autonomous_loop_user",
"type": "autonomous_loop_processor",
"splittable": false,
"groups": [
{
......
......@@ -4,7 +4,7 @@
},
"loops": {
"loop_super_block": {
"algorithm": "user/db_input_loop_user/1",
"algorithm": "user/db_input_loop_processor/1",
"parameters": {
},
"inputs": {
......@@ -14,7 +14,7 @@
"out": "out"
},
"loop_algorithm": "user/db_input_loop/1",
"loop_algorithm": "user/db_input_loop_evaluator/1",
"loop_parameters": {
"threshold": 1
},
......@@ -62,7 +62,7 @@
"version": "1.3.0"
},
"queue": "queue",
"user/db_input_loop/1" : {
"user/db_input_loop_evaluator/1" : {
"threshold": 9
}
}
......
{
"schema_version": 2,
"blocks": {
"echo_for_loop_user": {
"echo_for_loop_processor": {
"algorithm": "v1/integers_echo/1",
"parameters": {
},
......@@ -12,7 +12,7 @@
"out_data": "out"
}
},
"echo_for_loop": {
"echo_for_loop_evaluator": {
"algorithm": "v1/integers_echo/1",
"parameters": {
},
......@@ -26,7 +26,7 @@
},
"loops": {
"loop_super_block": {
"algorithm": "user/db_input_loop_user/1",
"algorithm": "user/db_input_loop_processor/1",
"parameters": {
},
"inputs": {
......@@ -36,7 +36,7 @@
"out": "out"
},
"loop_algorithm": "user/db_input_loop/1",
"loop_algorithm": "user/db_input_loop_evaluator/1",
"loop_parameters": {
"threshold": 1
},
......@@ -48,7 +48,7 @@
}
},
"echo_loop_block": {
"algorithm": "user/block_input_loop_user/1",
"algorithm": "user/block_input_loop_processor/1",
"parameters": {
},
"inputs": {
......@@ -58,7 +58,7 @@
"out": "out"
},
"loop_algorithm": "user/block_input_loop/1",
"loop_algorithm": "user/block_input_loop_evaluator/1",
"loop_parameters": {
"threshold": 1
},
......@@ -106,7 +106,7 @@
"version": "1.3.0"
},
"queue": "queue",
"user/db_input_loop/1" : {
"user/db_input_loop_evaluator/1" : {
"threshold": 9
}
}
......
......@@ -13,21 +13,21 @@
},
{
"from": "loop_super_block.out",
"to": "echo_for_loop_user.in",
"to": "echo_for_loop_processor.in",
"channel": "integers"
},
{
"from": "loop_super_block.out_loop",
"to": "echo_for_loop.in",
"to": "echo_for_loop_evaluator.in",
"channel": "integers"
},
{
"from": "echo_for_loop_user.out",
"from": "echo_for_loop_processor.out",
"to": "echo_loop_block.in",
"channel": "integers"
},
{
"from": "echo_for_loop.out",
"from": "echo_for_loop_evaluator.out",
"to": "echo_loop_block.in_loop",
"channel": "integers"
},
......@@ -93,7 +93,7 @@
],
"blocks": [
{
"name": "echo_for_loop_user",
"name": "echo_for_loop_processor",
"synchronized_channel": "integers",
"inputs": [
"in"
......@@ -103,7 +103,7 @@
]
},
{
"name": "echo_for_loop",
"name": "echo_for_loop_evaluator",
"synchronized_channel": "integers",
"inputs": [
"in"
......
......@@ -120,12 +120,12 @@ def test_analyzer_v2():
def test_v3():
algorithm = Algorithm(prefix, "autonomous/loop/1")
algorithm = Algorithm(prefix, "autonomous/loop_evaluator/1")
nose.tools.assert_true(
algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors)
)
algorithm = Algorithm(prefix, "autonomous/loop_user/1")
algorithm = Algorithm(prefix, "autonomous/loop_processor/1")
nose.tools.assert_true(
algorithm.valid, "\n * %s" % "\n * ".join(algorithm.errors)
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment