diff --git a/par-greeter/air-scripts/air_echo.clj b/par-greeter/air-scripts/air_echo.clj index 91fa9bb..12b6477 100644 --- a/par-greeter/air-scripts/air_echo.clj +++ b/par-greeter/air-scripts/air_echo.clj @@ -7,7 +7,6 @@ (seq (call relay ("op" "identity") []) (call %init_peer_id% (returnService "run") [array_result]) - ; (call %init_peer_id% (returnService "run") [array_result.$.[2]!]) ) ) (seq diff --git a/par-greeter/air-scripts/air_echo_greeter.clj b/par-greeter/air-scripts/air_echo_greeter.clj new file mode 100644 index 0000000..cec60c9 --- /dev/null +++ b/par-greeter/air-scripts/air_echo_greeter.clj @@ -0,0 +1,41 @@ +(xor + (seq + (seq + (seq + (call relay ("op" "identity") []) + (call node_1 (echo_service "echo") [names] echo_result) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [echo_result]) + ) + ) + (seq + (seq + (seq + (call relay ("op" "identity") []) + (call node_2 (greeting_service_1 "greeting") [echo_result.$.[0]["echo"]!] greeter_result_0) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [greeter_result_0]) + ) + ) + (seq + (seq + (call relay ("op" "identity") []) + (call node_3 (greeting_service_2 "greeting") [echo_result.$.[1]["echo"]!] greeter_result_1) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [greeter_result_1]) + ) + ) + ) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") ["XOR FAILED" %last_error%]) + ) + +) \ No newline at end of file diff --git a/par-greeter/air-scripts/air_fold.clj b/par-greeter/air-scripts/air_fold.clj index d8b3266..6b2f924 100644 --- a/par-greeter/air-scripts/air_fold.clj +++ b/par-greeter/air-scripts/air_fold.clj @@ -2,47 +2,29 @@ (seq (seq (seq - (call relay ("op" "identity") []) - (call node (echo_service "echo") [names] array_result) - ) - (seq + (seq + (call relay ("op" "identity") []) + (call node (echo_service "echo") [names] array_result) + ) (seq (call relay ("op" "identity") []) (call %init_peer_id% (returnService "run") [array_result]) ) - (seq - (fold array_result item - (seq - (seq - (call relay ("op" "identity") []) - (call node (greeting_service "greeting") [item] greeter_results[]) - ) - (seq - (call relay ("op" "identity") []) - (next item) - ) - ) - ) + (seq + (fold array_result item (seq - (call relay ("op" "identity") []) - (call %init_peer_id% ("returnService" "run") [greeter_results]) + (call node (greeting_service "greeting") [item] greeter_results[]) + (next item) ) - ) ) ) (seq - (seq - (call relay ("op" "identity") []) - (call node (greeting_service "greeting") ["boo yah"] last_result) - ) - (seq - (call relay ("op" "identity") []) - (call %init_peer_id% (returnService "run") [last_result]) - ) + (call relay ("op" "identity") []) + (call %init_peer_id% ("returnService" "run") [greeter_results]) ) ) (seq (call relay ("op" "identity") []) - (call %init_peer_id% (returnService "run") ["XOR FAILED %last_error"]) + (call %init_peer_id% (returnService "run") ["XOR FAILED" %last_error%]) ) ) \ No newline at end of file diff --git a/par-greeter/air-scripts/air_fold_par_bad.clj b/par-greeter/air-scripts/air_fold_par_bad.clj new file mode 100644 index 0000000..955e82c --- /dev/null +++ b/par-greeter/air-scripts/air_fold_par_bad.clj @@ -0,0 +1,43 @@ +(xor + (seq + (seq + (seq + (call relay ("op" "identity") []) + (call node_1 (echo_service "echo") [names] array_result) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [array_result]) + ) + ) + (seq + (fold array_result item + (par + (seq + (seq + (call node_2 (greeting_service_1 "greeting") [item.$.["echo"]!] greeting_1_result[]) + (next item) + ) + (seq + (call node_3 (greeting_service_2 "greeting") [item.$.["echo"]!] greeting_2_result[]) + (next item) + ) + ) + (seq + (call node_4 (greeting_service_3 "greeting") [item.$.["echo"]!] greeting_3_result[]) + (next item) + ) + ) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [greeting_1_result greeting_2_result greeting_3_result]) + ) + ) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") ["XOR FAILED %last_error"]) + ) +) + diff --git a/par-greeter/air-scripts/air_fold_seq.clj b/par-greeter/air-scripts/air_fold_seq.clj new file mode 100644 index 0000000..c08015c --- /dev/null +++ b/par-greeter/air-scripts/air_fold_seq.clj @@ -0,0 +1,48 @@ +(xor + (seq + (seq + (seq + (call relay ("op" "identity") []) + (call node_1 (echo_service "echo") [names] array_result) + ) + (seq + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [array_result]) + ) + (seq + (fold array_result item + (seq + (seq + (call relay ("op" "identity") []) + (call node_2 (greeting_service_1 "greeting") [item.$.["echo"]!] greeter_results[]) + ) + (seq + (call relay ("op" "identity") []) + (next item) + ) + ) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% ("returnService" "run") [greeter_results]) + ) + ) + ) + ) + (seq + (seq + (call relay ("op" "identity") []) + (call node (greeting_service "greeting") ["boo yah"] last_result) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") [last_result]) + ) + ) + ) + (seq + (call relay ("op" "identity") []) + (call %init_peer_id% (returnService "run") ["XOR FAILED" %last_error%]) + ) +) \ No newline at end of file