diff --git a/demo/fixed_points/__init__.py b/demo/fp_demos/__init__.py similarity index 100% rename from demo/fixed_points/__init__.py rename to demo/fp_demos/__init__.py diff --git a/demo/fixed_points/ball_controller.py b/demo/fp_demos/ball_controller.py similarity index 100% rename from demo/fixed_points/ball_controller.py rename to demo/fp_demos/ball_controller.py diff --git a/demo/fixed_points/ball_scenario_branch.py b/demo/fp_demos/ball_scenario_branch.py similarity index 100% rename from demo/fixed_points/ball_scenario_branch.py rename to demo/fp_demos/ball_scenario_branch.py diff --git a/demo/fixed_points/ball_scenario_branch_nt.py b/demo/fp_demos/ball_scenario_branch_nt.py similarity index 100% rename from demo/fixed_points/ball_scenario_branch_nt.py rename to demo/fp_demos/ball_scenario_branch_nt.py diff --git a/demo/fixed_points/ball_scenario_copy.py b/demo/fp_demos/ball_scenario_copy.py similarity index 100% rename from demo/fixed_points/ball_scenario_copy.py rename to demo/fp_demos/ball_scenario_copy.py diff --git a/demo/fixed_points/bouncing_ball.py b/demo/fp_demos/bouncing_ball.py similarity index 100% rename from demo/fixed_points/bouncing_ball.py rename to demo/fp_demos/bouncing_ball.py diff --git a/demo/fixed_points/bouncing_ball_scenario.py b/demo/fp_demos/bouncing_ball_scenario.py similarity index 100% rename from demo/fixed_points/bouncing_ball_scenario.py rename to demo/fp_demos/bouncing_ball_scenario.py diff --git a/demo/fixed_points/brusselator.py b/demo/fp_demos/brusselator.py similarity index 100% rename from demo/fixed_points/brusselator.py rename to demo/fp_demos/brusselator.py diff --git a/demo/fixed_points/buckling_col.py b/demo/fp_demos/buckling_col.py similarity index 100% rename from demo/fixed_points/buckling_col.py rename to demo/fp_demos/buckling_col.py diff --git a/demo/fixed_points/cardiac_cell_agent.py b/demo/fp_demos/cardiac_cell_agent.py similarity index 100% rename from demo/fixed_points/cardiac_cell_agent.py rename to demo/fp_demos/cardiac_cell_agent.py diff --git a/demo/fixed_points/cardiac_cell_controller.py b/demo/fp_demos/cardiac_cell_controller.py similarity index 100% rename from demo/fixed_points/cardiac_cell_controller.py rename to demo/fp_demos/cardiac_cell_controller.py diff --git a/demo/fixed_points/cardiac_cell_demo.py b/demo/fp_demos/cardiac_cell_demo.py similarity index 81% rename from demo/fixed_points/cardiac_cell_demo.py rename to demo/fp_demos/cardiac_cell_demo.py index d2e99670..1922c8b4 100644 --- a/demo/fixed_points/cardiac_cell_demo.py +++ b/demo/fp_demos/cardiac_cell_demo.py @@ -32,14 +32,14 @@ 'cell', init_cell,(CellMode.On,) ) - trace = scenario.verify(10, 0.01) - sim = scenario.simulate(10, 0.01) - pp_fix(reach_at_fix(trace, 0, 10)) - print(f'Fixed points exists? {fixed_points_fix(trace, 15, 0.01)}') + trace = scenario.verify(30, 0.01) + # sim = scenario.simulate(10, 0.01) + # pp_fix(reach_at_fix(trace, 0, 10)) + print(f'Fixed points exists? {fixed_points_fix(trace, 30, 0.01)}') fig = go.Figure() fig = reachtube_tree(trace, None, fig, 0, 1, [0, 1], "fill", "trace") - fig = reachtube_tree(trace, None, fig, 0, 1, [0, 1], "fill", "trace") + # fig = reachtube_tree(trace, None, fig, 0, 1, [0, 1], "fill", "trace") # fig = simulation_tree(trace, None, fig, 1, 2, [1, 2], "fill", "trace") fig.show() \ No newline at end of file diff --git a/demo/fixed_points/helicopter.py b/demo/fp_demos/helicopter.py similarity index 100% rename from demo/fixed_points/helicopter.py rename to demo/fp_demos/helicopter.py diff --git a/demo/fixed_points/jet_engine.py b/demo/fp_demos/jet_engine.py similarity index 100% rename from demo/fixed_points/jet_engine.py rename to demo/fp_demos/jet_engine.py diff --git a/demo/fixed_points/lin_thermo.py b/demo/fp_demos/lin_thermo.py similarity index 100% rename from demo/fixed_points/lin_thermo.py rename to demo/fp_demos/lin_thermo.py diff --git a/demo/fixed_points/mp4_p2.py b/demo/fp_demos/mp4_p2.py similarity index 100% rename from demo/fixed_points/mp4_p2.py rename to demo/fp_demos/mp4_p2.py diff --git a/demo/fixed_points/nav_sys.py b/demo/fp_demos/nav_sys.py similarity index 100% rename from demo/fixed_points/nav_sys.py rename to demo/fp_demos/nav_sys.py diff --git a/demo/fixed_points/power_train.py b/demo/fp_demos/power_train.py similarity index 100% rename from demo/fixed_points/power_train.py rename to demo/fp_demos/power_train.py diff --git a/demo/fixed_points/reachtube_copy.py b/demo/fp_demos/reachtube_copy.py similarity index 100% rename from demo/fixed_points/reachtube_copy.py rename to demo/fp_demos/reachtube_copy.py diff --git a/demo/fixed_points/robot.py b/demo/fp_demos/robot.py similarity index 100% rename from demo/fixed_points/robot.py rename to demo/fp_demos/robot.py diff --git a/demo/fixed_points/total_motion.py b/demo/fp_demos/total_motion.py similarity index 100% rename from demo/fixed_points/total_motion.py rename to demo/fp_demos/total_motion.py diff --git a/demo/fixed_points/traffic_controller.py b/demo/fp_demos/traffic_controller.py similarity index 100% rename from demo/fixed_points/traffic_controller.py rename to demo/fp_demos/traffic_controller.py diff --git a/demo/fixed_points/traffic_signal_scenario.py b/demo/fp_demos/traffic_signal_scenario.py similarity index 92% rename from demo/fixed_points/traffic_signal_scenario.py rename to demo/fp_demos/traffic_signal_scenario.py index 0c84b4b5..a43270c1 100644 --- a/demo/fixed_points/traffic_signal_scenario.py +++ b/demo/fp_demos/traffic_signal_scenario.py @@ -122,11 +122,7 @@ fig = reachtube_tree_slice(trace, None, fig, 1, 2, [1, 2], "fill", "trace", plot_color=colors[1:]) fig = simulation_tree(sim, None, fig, 1, 2, [1, 2], "fill", "trace", plot_color=colors[2:]) fig.show() - # print(f'Do there exist fixed points? {fixed_points(ball_scenario, "red-ball", t=80)}') - # print(f'Do there exist fixed points? {fixed_points_aa_branching(ball_scenario, t=80)}') - # print(f'Do there exist fixed points? {fixed_points_aa_branching(ball_scenario_branch, t=80)}') - # print(f'Do there exist fixed points? {fixed_points_aa_branching_composed(ball_scenario_branch, t=80)}') - # print(f'Do there exist fixed points? {fixed_points_aa_branching(ball_scenario_branch_nt, t=40)}') + ### # ----------------------------------------- diff --git a/demo/fixed_points/vehicle_controller.py b/demo/fp_demos/vehicle_controller.py similarity index 100% rename from demo/fixed_points/vehicle_controller.py rename to demo/fp_demos/vehicle_controller.py