diff --git a/deathstar_hotel_reservation/entities/user.py b/deathstar_hotel_reservation/entities/user.py index dba7567..112ed64 100644 --- a/deathstar_hotel_reservation/entities/user.py +++ b/deathstar_hotel_reservation/entities/user.py @@ -31,10 +31,11 @@ def order_compiled_entry_1(variable_map: dict[str, Any], state: User) -> Any: pass def order_compiled_if_cond(variable_map: dict[str, Any], state: User) -> Any: - return variable_map["hotel_reserve"] and variable_map["flight_reserve"] - -def order_compiled_if_cond_parallel(variable_map: dict[str, Any], state: User) -> Any: - return variable_map["reserves"][0] and variable_map["reserves"][1] + # parallel + if "reserves" in variable_map: + return variable_map["reserves"][0] and variable_map["reserves"][1] + else: + return variable_map["hotel_reserve"] and variable_map["flight_reserve"] def order_compiled_if_body(variable_map: dict[str, Any], state: User) -> Any: return True @@ -48,8 +49,7 @@ def order_compiled_else_body(variable_map: dict[str, Any], state: User) -> Any: "login": check_compiled, "order_compiled_entry_0": order_compiled_entry_0, "order_compiled_entry_1": order_compiled_entry_1, - # "order_compiled_if_cond": order_compiled_if_cond, - "order_compiled_if_cond": order_compiled_if_cond_parallel, + "order_compiled_if_cond": order_compiled_if_cond, "order_compiled_if_body": order_compiled_if_body, "order_compiled_else_body": order_compiled_else_body }, diff --git a/deathstar_movie_review/test_movie_review_demo.py b/deathstar_movie_review/test_movie_review_demo.py index 78e3358..27cc6f7 100644 --- a/deathstar_movie_review/test_movie_review_demo.py +++ b/deathstar_movie_review/test_movie_review_demo.py @@ -4,7 +4,7 @@ from deathstar_movie_review.entities.compose_review import ComposeReview, compose_review_op from deathstar_movie_review.entities.user import User, user_op from deathstar_movie_review.entities.movie import MovieId, movie_id_op, movie_info_op, plot_op -from deathstar_movie_review.entities.frontend import frontend_op, text_op, unique_id_op +from deathstar_movie_review.entities.frontend import frontend_op, text_op, unique_id_op, frontend_df_serial @@ -12,6 +12,11 @@ def test_deathstar_movie_demo_python(): print("starting") runtime = PythonRuntime() + # make sure we're running the serial version + prev_df = frontend_op.dataflow + frontend_op.dataflow = frontend_df_serial() + + print(frontend_op.dataflow.to_dot()) dead_node_elimination([], [frontend_op]) print(frontend_op.dataflow.to_dot()) @@ -98,4 +103,7 @@ def test_deathstar_movie_demo_python(): assert result == expected print("Success!") + + # put the df back + frontend_op.dataflow = prev_df \ No newline at end of file