From 0cc94515e0161f68cb24183b315acbf3945ddf73 Mon Sep 17 00:00:00 2001 From: Yangge Li <li213@illinois.edu> Date: Fri, 29 Jul 2022 21:57:53 -0500 Subject: [PATCH] change package name to verse --- demo/F16/F16_waypoint_scene.py | 4 ++-- demo/F16/aerobench/run_f16_sim.py | 2 +- demo/ball/ball_bounces.py | 8 +++---- demo/ball_bounces_dev.py | 6 ++--- demo/dryvr_demo/origin_agent.py | 4 ++-- demo/dryvr_demo/rendezvous_demo.py | 4 ++-- demo/dryvr_demo/thermo_demo.py | 4 ++-- demo/dryvr_demo/thermo_demo2.py | 4 ++-- demo/dryvr_demo/vanderpol_demo.py | 4 ++-- demo/dryvr_demo/vanderpol_demo2.py | 4 ++-- demo/quadrotor/quadrotor_agent.py | 4 ++-- demo/quadrotor/quadrotor_demo.py | 6 ++--- .../vehicle/controller/example_controller3.py | 2 +- .../example_two_car_sign_lane_switch.py | 24 +++++++++---------- demo/vehicle/demo2.py | 6 ++--- demo/vehicle/demo3.py | 6 ++--- demo/vehicle/demo4.py | 6 ++--- demo/vehicle/demo5.py | 6 ++--- demo/vehicle/demo6.py | 6 ++--- demo/vehicle/demo7.py | 8 +++---- demo/vehicle/demo8.py | 6 ++--- demo/vehicle/demo_opendrive.py | 8 +++---- setup.py | 4 ++-- tests/testdpp.py | 6 ++--- {dryvr_plus_plus => verse}/__init__.py | 0 {dryvr_plus_plus => verse}/agents/__init__.py | 0 .../agents/base_agent.py | 2 +- .../analysis/__init__.py | 0 .../analysis/analysis_tree.py | 0 .../analysis/simulator.py | 4 ++-- .../analysis/verifier.py | 6 ++--- .../automaton/__init__.py | 0 {dryvr_plus_plus => verse}/automaton/guard.py | 8 +++---- .../automaton/hybrid_automaton.py | 0 .../automaton/hybrid_io_automaton.py | 2 +- {dryvr_plus_plus => verse}/automaton/reset.py | 2 +- .../code_parser/__init__.py | 0 .../code_parser/astunparser.py | 0 .../code_parser/parser.py | 4 ++-- .../example/__init__.py | 0 .../example/example_agent/__init__.py | 0 .../example/example_agent/ball_agent.py | 4 ++-- .../example/example_agent/car_agent.py | 6 ++--- .../example/example_agent/sign_agent.py | 4 ++-- .../example/example_map/__init__.py | 0 .../example/example_map/simple_map.py | 2 +- .../example/example_map/simple_map2.py | 2 +- .../example/example_sensor/__init__.py | 0 .../example/example_sensor/fake_sensor.py | 0 {dryvr_plus_plus => verse}/map/__init__.py | 0 {dryvr_plus_plus => verse}/map/lane.py | 2 +- {dryvr_plus_plus => verse}/map/lane_map.py | 4 ++-- .../map/lane_segment.py | 2 +- .../map/opendrive_parser.py | 6 ++--- .../plotter/__init__.py | 0 .../plotter/plotter2D.py | 4 ++-- .../plotter/plotter3D.py | 0 .../plotter/plotter_README.md | 0 .../reachability_engine/__init__.py | 0 .../reachability_engine/dryvr.py | 2 +- .../reachability_engine/utils.py | 0 .../scenario/__init__.py | 0 .../scenario/scenario.py | 12 +++++----- {dryvr_plus_plus => verse}/sensor/__init__.py | 0 .../sensor/base_sensor.py | 2 +- 65 files changed, 111 insertions(+), 111 deletions(-) rename {dryvr_plus_plus => verse}/__init__.py (100%) rename {dryvr_plus_plus => verse}/agents/__init__.py (100%) rename {dryvr_plus_plus => verse}/agents/base_agent.py (84%) rename {dryvr_plus_plus => verse}/analysis/__init__.py (100%) rename {dryvr_plus_plus => verse}/analysis/analysis_tree.py (100%) rename {dryvr_plus_plus => verse}/analysis/simulator.py (97%) rename {dryvr_plus_plus => verse}/analysis/verifier.py (95%) rename {dryvr_plus_plus => verse}/automaton/__init__.py (100%) rename {dryvr_plus_plus => verse}/automaton/guard.py (99%) rename {dryvr_plus_plus => verse}/automaton/hybrid_automaton.py (100%) rename {dryvr_plus_plus => verse}/automaton/hybrid_io_automaton.py (90%) rename {dryvr_plus_plus => verse}/automaton/reset.py (98%) rename {dryvr_plus_plus => verse}/code_parser/__init__.py (100%) rename {dryvr_plus_plus => verse}/code_parser/astunparser.py (100%) rename {dryvr_plus_plus => verse}/code_parser/parser.py (99%) rename {dryvr_plus_plus => verse}/example/__init__.py (100%) rename {dryvr_plus_plus => verse}/example/example_agent/__init__.py (100%) rename {dryvr_plus_plus => verse}/example/example_agent/ball_agent.py (96%) rename {dryvr_plus_plus => verse}/example/example_agent/car_agent.py (97%) rename {dryvr_plus_plus => verse}/example/example_agent/sign_agent.py (82%) rename {dryvr_plus_plus => verse}/example/example_map/__init__.py (100%) rename {dryvr_plus_plus => verse}/example/example_map/simple_map.py (95%) rename {dryvr_plus_plus => verse}/example/example_map/simple_map2.py (98%) rename {dryvr_plus_plus => verse}/example/example_sensor/__init__.py (100%) rename {dryvr_plus_plus => verse}/example/example_sensor/fake_sensor.py (100%) rename {dryvr_plus_plus => verse}/map/__init__.py (100%) rename {dryvr_plus_plus => verse}/map/lane.py (96%) rename {dryvr_plus_plus => verse}/map/lane_map.py (97%) rename {dryvr_plus_plus => verse}/map/lane_segment.py (99%) rename {dryvr_plus_plus => verse}/map/opendrive_parser.py (99%) rename {dryvr_plus_plus => verse}/plotter/__init__.py (100%) rename {dryvr_plus_plus => verse}/plotter/plotter2D.py (99%) rename {dryvr_plus_plus => verse}/plotter/plotter3D.py (100%) rename {dryvr_plus_plus => verse}/plotter/plotter_README.md (100%) rename {dryvr_plus_plus => verse}/reachability_engine/__init__.py (100%) rename {dryvr_plus_plus => verse}/reachability_engine/dryvr.py (99%) rename {dryvr_plus_plus => verse}/reachability_engine/utils.py (100%) rename {dryvr_plus_plus => verse}/scenario/__init__.py (100%) rename {dryvr_plus_plus => verse}/scenario/scenario.py (98%) rename {dryvr_plus_plus => verse}/sensor/__init__.py (100%) rename {dryvr_plus_plus => verse}/sensor/base_sensor.py (98%) diff --git a/demo/F16/F16_waypoint_scene.py b/demo/F16/F16_waypoint_scene.py index 8f557248..d41c7556 100644 --- a/demo/F16/F16_waypoint_scene.py +++ b/demo/F16/F16_waypoint_scene.py @@ -11,8 +11,8 @@ from scipy.integrate import ode from enum import Enum, auto from demo.F16.aerobench.run_f16_sim import F16Agent -from dryvr_plus_plus import LaneMap -from dryvr_plus_plus import Scenario +from verse import LaneMap +from verse import Scenario import copy diff --git a/demo/F16/aerobench/run_f16_sim.py b/demo/F16/aerobench/run_f16_sim.py index 59f5633b..34137b69 100644 --- a/demo/F16/aerobench/run_f16_sim.py +++ b/demo/F16/aerobench/run_f16_sim.py @@ -11,7 +11,7 @@ from scipy.integrate import RK45 from aerobench.highlevel.controlled_f16 import controlled_f16 from aerobench.util import get_state_names, Euler -from dryvr_plus_plus import BaseAgent +from verse import BaseAgent class F16Agent(BaseAgent): diff --git a/demo/ball/ball_bounces.py b/demo/ball/ball_bounces.py index 8d5c6caf..691583b3 100644 --- a/demo/ball/ball_bounces.py +++ b/demo/ball/ball_bounces.py @@ -1,11 +1,11 @@ -from dryvr_plus_plus.plotter.plotter2D import * -from dryvr_plus_plus.example import SimpleMap3, BallAgent -from dryvr_plus_plus import Scenario +from verse.plotter.plotter2D import * +from verse.example import SimpleMap3, BallAgent +from verse import Scenario from enum import Enum, auto import copy -# from dryvr_plus_plus.map import Lane +# from verse.map import Lane class BallMode(Enum): diff --git a/demo/ball_bounces_dev.py b/demo/ball_bounces_dev.py index e8f5ea25..580c0319 100644 --- a/demo/ball_bounces_dev.py +++ b/demo/ball_bounces_dev.py @@ -41,9 +41,9 @@ def controller(ego:State, other: State): assert not (close(ego, other) and ego.x < other.x), "collision" return output -from dryvr_plus_plus.example import BallAgent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import BallAgent +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go if __name__ == "__main__": diff --git a/demo/dryvr_demo/origin_agent.py b/demo/dryvr_demo/origin_agent.py index 1cb95bda..e3a59584 100644 --- a/demo/dryvr_demo/origin_agent.py +++ b/demo/dryvr_demo/origin_agent.py @@ -4,8 +4,8 @@ from typing import Tuple, List import numpy as np from scipy.integrate import ode -from dryvr_plus_plus.agents import BaseAgent -from dryvr_plus_plus.map import LaneMap +from verse.agents import BaseAgent +from verse.map import LaneMap class vanderpol_agent(BaseAgent): diff --git a/demo/dryvr_demo/rendezvous_demo.py b/demo/dryvr_demo/rendezvous_demo.py index 91919476..3c281bfe 100644 --- a/demo/dryvr_demo/rendezvous_demo.py +++ b/demo/dryvr_demo/rendezvous_demo.py @@ -1,6 +1,6 @@ from origin_agent import craft_agent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go from enum import Enum, auto diff --git a/demo/dryvr_demo/thermo_demo.py b/demo/dryvr_demo/thermo_demo.py index 414d52b7..e5ce9cbb 100644 --- a/demo/dryvr_demo/thermo_demo.py +++ b/demo/dryvr_demo/thermo_demo.py @@ -1,6 +1,6 @@ from origin_agent import thermo_agent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go from enum import Enum, auto diff --git a/demo/dryvr_demo/thermo_demo2.py b/demo/dryvr_demo/thermo_demo2.py index 0173b2b2..08882868 100644 --- a/demo/dryvr_demo/thermo_demo2.py +++ b/demo/dryvr_demo/thermo_demo2.py @@ -1,6 +1,6 @@ from origin_agent import thermo_agent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go from enum import Enum, auto diff --git a/demo/dryvr_demo/vanderpol_demo.py b/demo/dryvr_demo/vanderpol_demo.py index e7d855df..947a1381 100644 --- a/demo/dryvr_demo/vanderpol_demo.py +++ b/demo/dryvr_demo/vanderpol_demo.py @@ -1,6 +1,6 @@ from origin_agent import vanderpol_agent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go from enum import Enum, auto diff --git a/demo/dryvr_demo/vanderpol_demo2.py b/demo/dryvr_demo/vanderpol_demo2.py index c19cb91f..b8e20da8 100644 --- a/demo/dryvr_demo/vanderpol_demo2.py +++ b/demo/dryvr_demo/vanderpol_demo2.py @@ -1,6 +1,6 @@ from origin_agent import vanderpol_agent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.plotter.plotter2D import * import plotly.graph_objects as go from enum import Enum, auto diff --git a/demo/quadrotor/quadrotor_agent.py b/demo/quadrotor/quadrotor_agent.py index cc5314f1..280348ec 100644 --- a/demo/quadrotor/quadrotor_agent.py +++ b/demo/quadrotor/quadrotor_agent.py @@ -6,8 +6,8 @@ import numpy as np from scipy.integrate import ode import torch import math -from dryvr_plus_plus.agents import BaseAgent -from dryvr_plus_plus.map import LaneMap +from verse.agents import BaseAgent +from verse.map import LaneMap class FFNNC(torch.nn.Module): def __init__(self, D_in=6, D_out=8): diff --git a/demo/quadrotor/quadrotor_demo.py b/demo/quadrotor/quadrotor_demo.py index 3af2febd..46ce7a16 100644 --- a/demo/quadrotor/quadrotor_demo.py +++ b/demo/quadrotor/quadrotor_demo.py @@ -1,7 +1,7 @@ from quadrotor_agent import QuadrotorAgent -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.example import SimpleMap2, SimpleMap3, SimpleMap5, SimpleMap6 -from dryvr_plus_plus.plotter.plotter2D import * +from verse import Scenario +from verse.example import SimpleMap2, SimpleMap3, SimpleMap5, SimpleMap6 +from verse.plotter.plotter2D import * import os import json import plotly.graph_objects as go diff --git a/demo/vehicle/controller/example_controller3.py b/demo/vehicle/controller/example_controller3.py index 96cf9c0f..c07a80ba 100644 --- a/demo/vehicle/controller/example_controller3.py +++ b/demo/vehicle/controller/example_controller3.py @@ -1,6 +1,6 @@ from enum import Enum, auto import copy -from dryvr_plus_plus.map import LaneMap +from verse.map import LaneMap class VehicleMode(Enum): Normal = auto() diff --git a/demo/vehicle/controller/example_two_car_sign_lane_switch.py b/demo/vehicle/controller/example_two_car_sign_lane_switch.py index 79c5e324..3a23d63b 100644 --- a/demo/vehicle/controller/example_two_car_sign_lane_switch.py +++ b/demo/vehicle/controller/example_two_car_sign_lane_switch.py @@ -1,9 +1,9 @@ -from dryvr_plus_plus.example import FakeSensor2 -from dryvr_plus_plus.example import SimpleMap3 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.example import SignAgent -from dryvr_plus_plus.example import CarAgent -from dryvr_plus_plus.plotter2D import * +from verse.example import FakeSensor2 +from verse.example import SimpleMap3 +from verse import Scenario +from verse.example import SignAgent +from verse.example import CarAgent +from verse.plotter2D import * from enum import Enum, auto import copy @@ -76,12 +76,12 @@ def controller(ego: State, other: State, sign: State, lane_map): return output -from dryvr_plus_plus.example.example_agent.car_agent import CarAgent -from dryvr_plus_plus.example.example_agent.sign_agent import SignAgent -from dryvr_plus_plus.scene_verifier.scenario.scenario import Scenario -from dryvr_plus_plus.example.example_map.simple_map2 import SimpleMap3 -from dryvr_plus_plus.plotter.plotter2D import plot_reachtube_tree, plot_simulation_tree -from dryvr_plus_plus.example.example_sensor.fake_sensor import FakeSensor2 +from verse.example.example_agent.car_agent import CarAgent +from verse.example.example_agent.sign_agent import SignAgent +from verse.scene_verifier.scenario.scenario import Scenario +from verse.example.example_map.simple_map2 import SimpleMap3 +from verse.plotter.plotter2D import plot_reachtube_tree, plot_simulation_tree +from verse.example.example_sensor.fake_sensor import FakeSensor2 import matplotlib.pyplot as plt diff --git a/demo/vehicle/demo2.py b/demo/vehicle/demo2.py index eae100aa..40701dce 100644 --- a/demo/vehicle/demo2.py +++ b/demo/vehicle/demo2.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus.example import CarAgent, SimpleMap3, FakeSensor2 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import CarAgent, SimpleMap3, FakeSensor2 +from verse import Scenario +from verse.plotter.plotter2D import * from enum import Enum, auto class VehicleMode(Enum): diff --git a/demo/vehicle/demo3.py b/demo/vehicle/demo3.py index 2c9295cf..a0ecba62 100644 --- a/demo/vehicle/demo3.py +++ b/demo/vehicle/demo3.py @@ -1,7 +1,7 @@ -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap3 -from dryvr_plus_plus import Scenario +from verse.example import CarAgent, NPCAgent, SimpleMap3 +from verse import Scenario from enum import Enum, auto -from dryvr_plus_plus.plotter.plotter2D import * +from verse.plotter.plotter2D import * import plotly.graph_objects as go diff --git a/demo/vehicle/demo4.py b/demo/vehicle/demo4.py index fb957854..6198e306 100644 --- a/demo/vehicle/demo4.py +++ b/demo/vehicle/demo4.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap4 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import CarAgent, NPCAgent, SimpleMap4 +from verse import Scenario +from verse.plotter.plotter2D import * from enum import Enum, auto import plotly.graph_objects as go diff --git a/demo/vehicle/demo5.py b/demo/vehicle/demo5.py index 4ac12688..0832c9f5 100644 --- a/demo/vehicle/demo5.py +++ b/demo/vehicle/demo5.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap3 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import CarAgent, NPCAgent, SimpleMap3 +from verse import Scenario +from verse.plotter.plotter2D import * from enum import Enum, auto diff --git a/demo/vehicle/demo6.py b/demo/vehicle/demo6.py index 63f4da41..f2cc4a41 100644 --- a/demo/vehicle/demo6.py +++ b/demo/vehicle/demo6.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap4 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import CarAgent, NPCAgent, SimpleMap4 +from verse import Scenario +from verse.plotter.plotter2D import * from enum import Enum, auto import plotly.graph_objects as go diff --git a/demo/vehicle/demo7.py b/demo/vehicle/demo7.py index 4dbafd2e..0a231314 100644 --- a/demo/vehicle/demo7.py +++ b/demo/vehicle/demo7.py @@ -1,9 +1,9 @@ # SM: Noting some things about the example -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap4 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * -from dryvr_plus_plus.analysis import AnalysisTree +from verse.example import CarAgent, NPCAgent, SimpleMap4 +from verse import Scenario +from verse.plotter.plotter2D import * +from verse.analysis import AnalysisTree from enum import Enum, auto import plotly.graph_objects as go diff --git a/demo/vehicle/demo8.py b/demo/vehicle/demo8.py index 6207cf8d..de51231b 100644 --- a/demo/vehicle/demo8.py +++ b/demo/vehicle/demo8.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus.example import CarAgent, SignAgent, SimpleMap3 -from dryvr_plus_plus import Scenario -from dryvr_plus_plus.plotter.plotter2D import * +from verse.example import CarAgent, SignAgent, SimpleMap3 +from verse import Scenario +from verse.plotter.plotter2D import * from enum import Enum, auto import plotly.graph_objects as go diff --git a/demo/vehicle/demo_opendrive.py b/demo/vehicle/demo_opendrive.py index 483082a2..8b5d6fb5 100644 --- a/demo/vehicle/demo_opendrive.py +++ b/demo/vehicle/demo_opendrive.py @@ -1,8 +1,8 @@ -from dryvr_plus_plus.example import CarAgent, NPCAgent, SimpleMap3 -from dryvr_plus_plus.map import opendrive_map -from dryvr_plus_plus import Scenario +from verse.example import CarAgent, NPCAgent, SimpleMap3 +from verse.map import opendrive_map +from verse import Scenario from enum import Enum, auto -from dryvr_plus_plus.plotter.plotter2D import * +from verse.plotter.plotter2D import * import plotly.graph_objects as go diff --git a/setup.py b/setup.py index 5de8757e..f2d6499c 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,9 @@ from setuptools import setup, find_packages setup( - name='dryvr_plus_plus', + name='verse', version='0.1', - description='DryVR++', + description='AutoVerse', author='Yangge Li, Katherine Braught, Haoqing Zhu', maintainer='Yangge Li, Katherine Braught, Haoqing Zhu', maintainer_email='{li213, braught2, haoqing3}@illinois.edu', diff --git a/tests/testdpp.py b/tests/testdpp.py index e030d766..2c3a82dd 100644 --- a/tests/testdpp.py +++ b/tests/testdpp.py @@ -47,9 +47,9 @@ def controller(ego:State): return output_vehicle_mode, output_lane_mode -from dryvr_plus_plus.example.example_agent.car_agent import CarAgent -from dryvr_plus_plus.scenario.scenario import Scenario -from dryvr_plus_plus.example.example_map.simple_map import SimpleMap2 +from verse.example.example_agent.car_agent import CarAgent +from verse.scenario.scenario import Scenario +from verse.example.example_map.simple_map import SimpleMap2 class TestSimulatorMethods(unittest.TestCase): diff --git a/dryvr_plus_plus/__init__.py b/verse/__init__.py similarity index 100% rename from dryvr_plus_plus/__init__.py rename to verse/__init__.py diff --git a/dryvr_plus_plus/agents/__init__.py b/verse/agents/__init__.py similarity index 100% rename from dryvr_plus_plus/agents/__init__.py rename to verse/agents/__init__.py diff --git a/dryvr_plus_plus/agents/base_agent.py b/verse/agents/base_agent.py similarity index 84% rename from dryvr_plus_plus/agents/base_agent.py rename to verse/agents/base_agent.py index 7b11747f..61bf79da 100644 --- a/dryvr_plus_plus/agents/base_agent.py +++ b/verse/agents/base_agent.py @@ -1,4 +1,4 @@ -from dryvr_plus_plus.code_parser import ControllerIR +from verse.code_parser import ControllerIR class BaseAgent: diff --git a/dryvr_plus_plus/analysis/__init__.py b/verse/analysis/__init__.py similarity index 100% rename from dryvr_plus_plus/analysis/__init__.py rename to verse/analysis/__init__.py diff --git a/dryvr_plus_plus/analysis/analysis_tree.py b/verse/analysis/analysis_tree.py similarity index 100% rename from dryvr_plus_plus/analysis/analysis_tree.py rename to verse/analysis/analysis_tree.py diff --git a/dryvr_plus_plus/analysis/simulator.py b/verse/analysis/simulator.py similarity index 97% rename from dryvr_plus_plus/analysis/simulator.py rename to verse/analysis/simulator.py index d8503485..abc5a5e3 100644 --- a/dryvr_plus_plus/analysis/simulator.py +++ b/verse/analysis/simulator.py @@ -6,8 +6,8 @@ import functools import pprint pp = functools.partial(pprint.pprint, compact=True, width=100) -from dryvr_plus_plus.agents.base_agent import BaseAgent -from dryvr_plus_plus.analysis.analysis_tree import AnalysisTreeNode, AnalysisTree +from verse.agents.base_agent import BaseAgent +from verse.analysis.analysis_tree import AnalysisTreeNode, AnalysisTree class Simulator: def __init__(self): diff --git a/dryvr_plus_plus/analysis/verifier.py b/verse/analysis/verifier.py similarity index 95% rename from dryvr_plus_plus/analysis/verifier.py rename to verse/analysis/verifier.py index f15622ac..60699aa8 100644 --- a/dryvr_plus_plus/analysis/verifier.py +++ b/verse/analysis/verifier.py @@ -3,9 +3,9 @@ import copy import numpy as np -from dryvr_plus_plus.agents.base_agent import BaseAgent -from dryvr_plus_plus.analysis.analysis_tree import AnalysisTreeNode, AnalysisTree -from dryvr_plus_plus.reachability_engine.dryvr import calc_bloated_tube, SIMTRACENUM +from verse.agents.base_agent import BaseAgent +from verse.analysis.analysis_tree import AnalysisTreeNode, AnalysisTree +from verse.reachability_engine.dryvr import calc_bloated_tube, SIMTRACENUM class Verifier: diff --git a/dryvr_plus_plus/automaton/__init__.py b/verse/automaton/__init__.py similarity index 100% rename from dryvr_plus_plus/automaton/__init__.py rename to verse/automaton/__init__.py diff --git a/dryvr_plus_plus/automaton/guard.py b/verse/automaton/guard.py similarity index 99% rename from dryvr_plus_plus/automaton/guard.py rename to verse/automaton/guard.py index 364c5ba6..37ae8522 100644 --- a/dryvr_plus_plus/automaton/guard.py +++ b/verse/automaton/guard.py @@ -4,10 +4,10 @@ import ast from z3 import * -from dryvr_plus_plus.map import LaneMap, AbstractLane -from dryvr_plus_plus.reachability_engine.utils import * -from dryvr_plus_plus.agents.base_agent import BaseAgent -from dryvr_plus_plus.code_parser import Reduction, ReductionType, unparse +from verse.map import LaneMap, AbstractLane +from verse.reachability_engine.utils import * +from verse.agents.base_agent import BaseAgent +from verse.code_parser import Reduction, ReductionType, unparse class LogicTreeNode: def __init__(self, data, child = [], val = None, mode_guard = None): diff --git a/dryvr_plus_plus/automaton/hybrid_automaton.py b/verse/automaton/hybrid_automaton.py similarity index 100% rename from dryvr_plus_plus/automaton/hybrid_automaton.py rename to verse/automaton/hybrid_automaton.py diff --git a/dryvr_plus_plus/automaton/hybrid_io_automaton.py b/verse/automaton/hybrid_io_automaton.py similarity index 90% rename from dryvr_plus_plus/automaton/hybrid_io_automaton.py rename to verse/automaton/hybrid_io_automaton.py index f2b7a302..1ebc5dd8 100644 --- a/dryvr_plus_plus/automaton/hybrid_io_automaton.py +++ b/verse/automaton/hybrid_io_automaton.py @@ -1,4 +1,4 @@ -from dryvr_plus_plus.automaton.hybrid_automaton import HybridAutomaton +from verse.automaton.hybrid_automaton import HybridAutomaton class HybridIoAutomaton(HybridAutomaton): def __init__( diff --git a/dryvr_plus_plus/automaton/reset.py b/verse/automaton/reset.py similarity index 98% rename from dryvr_plus_plus/automaton/reset.py rename to verse/automaton/reset.py index 04fa1cae..b10461f1 100644 --- a/dryvr_plus_plus/automaton/reset.py +++ b/verse/automaton/reset.py @@ -1,7 +1,7 @@ import itertools, copy import numpy as np -from dryvr_plus_plus.code_parser import unparse +from verse.code_parser import unparse class ResetExpression(): def __init__(self, reset): diff --git a/dryvr_plus_plus/code_parser/__init__.py b/verse/code_parser/__init__.py similarity index 100% rename from dryvr_plus_plus/code_parser/__init__.py rename to verse/code_parser/__init__.py diff --git a/dryvr_plus_plus/code_parser/astunparser.py b/verse/code_parser/astunparser.py similarity index 100% rename from dryvr_plus_plus/code_parser/astunparser.py rename to verse/code_parser/astunparser.py diff --git a/dryvr_plus_plus/code_parser/parser.py b/verse/code_parser/parser.py similarity index 99% rename from dryvr_plus_plus/code_parser/parser.py rename to verse/code_parser/parser.py index 4e3260ab..a7b5fe65 100644 --- a/dryvr_plus_plus/code_parser/parser.py +++ b/verse/code_parser/parser.py @@ -2,8 +2,8 @@ import ast, copy, warnings from typing import List, Dict, Union, Optional, Any, Tuple from dataclasses import dataclass, field, fields from enum import Enum, auto -from dryvr_plus_plus.code_parser import astunparser -from dryvr_plus_plus.reachability_engine.utils import find +from verse.code_parser import astunparser +from verse.reachability_engine.utils import find def merge_conds(c): if len(c) == 0: diff --git a/dryvr_plus_plus/example/__init__.py b/verse/example/__init__.py similarity index 100% rename from dryvr_plus_plus/example/__init__.py rename to verse/example/__init__.py diff --git a/dryvr_plus_plus/example/example_agent/__init__.py b/verse/example/example_agent/__init__.py similarity index 100% rename from dryvr_plus_plus/example/example_agent/__init__.py rename to verse/example/example_agent/__init__.py diff --git a/dryvr_plus_plus/example/example_agent/ball_agent.py b/verse/example/example_agent/ball_agent.py similarity index 96% rename from dryvr_plus_plus/example/example_agent/ball_agent.py rename to verse/example/example_agent/ball_agent.py index 2628d55f..6552a722 100644 --- a/dryvr_plus_plus/example/example_agent/ball_agent.py +++ b/verse/example/example_agent/ball_agent.py @@ -4,8 +4,8 @@ from typing import Tuple, List import numpy as np from scipy.integrate import ode -from dryvr_plus_plus import BaseAgent -from dryvr_plus_plus import LaneMap +from verse import BaseAgent +from verse import LaneMap class BallAgent(BaseAgent): diff --git a/dryvr_plus_plus/example/example_agent/car_agent.py b/verse/example/example_agent/car_agent.py similarity index 97% rename from dryvr_plus_plus/example/example_agent/car_agent.py rename to verse/example/example_agent/car_agent.py index 5aee874c..def152e2 100644 --- a/dryvr_plus_plus/example/example_agent/car_agent.py +++ b/verse/example/example_agent/car_agent.py @@ -4,9 +4,9 @@ from typing import Tuple, List import numpy as np from scipy.integrate import ode -from dryvr_plus_plus import BaseAgent -from dryvr_plus_plus import LaneMap -from dryvr_plus_plus.code_parser import ControllerIR +from verse import BaseAgent +from verse import LaneMap +from verse.code_parser import ControllerIR class NPCAgent(BaseAgent): def __init__(self, id): diff --git a/dryvr_plus_plus/example/example_agent/sign_agent.py b/verse/example/example_agent/sign_agent.py similarity index 82% rename from dryvr_plus_plus/example/example_agent/sign_agent.py rename to verse/example/example_agent/sign_agent.py index 31db9278..065ff90a 100644 --- a/dryvr_plus_plus/example/example_agent/sign_agent.py +++ b/verse/example/example_agent/sign_agent.py @@ -1,6 +1,6 @@ -from dryvr_plus_plus import BaseAgent +from verse import BaseAgent import numpy as np -from dryvr_plus_plus.code_parser import ControllerIR +from verse.code_parser import ControllerIR class SignAgent(BaseAgent): def __init__(self, id): diff --git a/dryvr_plus_plus/example/example_map/__init__.py b/verse/example/example_map/__init__.py similarity index 100% rename from dryvr_plus_plus/example/example_map/__init__.py rename to verse/example/example_map/__init__.py diff --git a/dryvr_plus_plus/example/example_map/simple_map.py b/verse/example/example_map/simple_map.py similarity index 95% rename from dryvr_plus_plus/example/example_map/simple_map.py rename to verse/example/example_map/simple_map.py index 943ef7c2..e0c97f29 100644 --- a/dryvr_plus_plus/example/example_map/simple_map.py +++ b/verse/example/example_map/simple_map.py @@ -1,4 +1,4 @@ -from dryvr_plus_plus import LaneMap, LaneSegment +from verse import LaneMap, LaneSegment class SimpleMap(LaneMap): def __init__(self): diff --git a/dryvr_plus_plus/example/example_map/simple_map2.py b/verse/example/example_map/simple_map2.py similarity index 98% rename from dryvr_plus_plus/example/example_map/simple_map2.py rename to verse/example/example_map/simple_map2.py index 22cf92da..84428e93 100644 --- a/dryvr_plus_plus/example/example_map/simple_map2.py +++ b/verse/example/example_map/simple_map2.py @@ -1,4 +1,4 @@ -from dryvr_plus_plus import LaneMap, LaneSegment, StraightLane, CircularLane, Lane +from verse import LaneMap, LaneSegment, StraightLane, CircularLane, Lane import numpy as np diff --git a/dryvr_plus_plus/example/example_sensor/__init__.py b/verse/example/example_sensor/__init__.py similarity index 100% rename from dryvr_plus_plus/example/example_sensor/__init__.py rename to verse/example/example_sensor/__init__.py diff --git a/dryvr_plus_plus/example/example_sensor/fake_sensor.py b/verse/example/example_sensor/fake_sensor.py similarity index 100% rename from dryvr_plus_plus/example/example_sensor/fake_sensor.py rename to verse/example/example_sensor/fake_sensor.py diff --git a/dryvr_plus_plus/map/__init__.py b/verse/map/__init__.py similarity index 100% rename from dryvr_plus_plus/map/__init__.py rename to verse/map/__init__.py diff --git a/dryvr_plus_plus/map/lane.py b/verse/map/lane.py similarity index 96% rename from dryvr_plus_plus/map/lane.py rename to verse/map/lane.py index 1d35f49c..ee16f0fb 100644 --- a/dryvr_plus_plus/map/lane.py +++ b/verse/map/lane.py @@ -2,7 +2,7 @@ from typing import List import numpy as np -from dryvr_plus_plus.map.lane_segment import AbstractLane +from verse.map.lane_segment import AbstractLane class Lane(): COMPENSATE = 3 diff --git a/dryvr_plus_plus/map/lane_map.py b/verse/map/lane_map.py similarity index 97% rename from dryvr_plus_plus/map/lane_map.py rename to verse/map/lane_map.py index a2643aba..e124ce69 100644 --- a/dryvr_plus_plus/map/lane_map.py +++ b/verse/map/lane_map.py @@ -4,8 +4,8 @@ from enum import Enum import numpy as np -from dryvr_plus_plus.map.lane_segment import AbstractLane -from dryvr_plus_plus.map.lane import Lane +from verse.map.lane_segment import AbstractLane +from verse.map.lane import Lane class LaneMap: def __init__(self, lane_seg_list:List[Lane] = []): diff --git a/dryvr_plus_plus/map/lane_segment.py b/verse/map/lane_segment.py similarity index 99% rename from dryvr_plus_plus/map/lane_segment.py rename to verse/map/lane_segment.py index a145f2d3..0fb1a1a2 100644 --- a/dryvr_plus_plus/map/lane_segment.py +++ b/verse/map/lane_segment.py @@ -3,7 +3,7 @@ from abc import ABCMeta, abstractmethod from typing import Tuple, List, Optional import copy -from dryvr_plus_plus.reachability_engine.utils import wrap_to_pi, Vector, get_class_path, to_serializable +from verse.reachability_engine.utils import wrap_to_pi, Vector, get_class_path, to_serializable class LineType: diff --git a/dryvr_plus_plus/map/opendrive_parser.py b/verse/map/opendrive_parser.py similarity index 99% rename from dryvr_plus_plus/map/opendrive_parser.py rename to verse/map/opendrive_parser.py index c6f71bca..02a86e6b 100644 --- a/dryvr_plus_plus/map/opendrive_parser.py +++ b/verse/map/opendrive_parser.py @@ -6,9 +6,9 @@ from bs4 import BeautifulSoup #Beautiful Soup library for parsing data in python ############################################################################################### #Import all the lane objects needed to generate all the lane map objects for the controllers -from dryvr_plus_plus.map.lane import Lane -from dryvr_plus_plus.map.lane_map import LaneMap -from dryvr_plus_plus.map.lane_segment import * +from verse.map.lane import Lane +from verse.map.lane_map import LaneMap +from verse.map.lane_segment import * ############################################################################################### ###############################ASAM OPEN DRIVE PARSING FUNCTION################################ diff --git a/dryvr_plus_plus/plotter/__init__.py b/verse/plotter/__init__.py similarity index 100% rename from dryvr_plus_plus/plotter/__init__.py rename to verse/plotter/__init__.py diff --git a/dryvr_plus_plus/plotter/plotter2D.py b/verse/plotter/plotter2D.py similarity index 99% rename from dryvr_plus_plus/plotter/plotter2D.py rename to verse/plotter/plotter2D.py index a3d5d0a7..6841c0be 100644 --- a/dryvr_plus_plus/plotter/plotter2D.py +++ b/verse/plotter/plotter2D.py @@ -7,7 +7,7 @@ import numpy as np import plotly.graph_objects as go from typing import List, Tuple, Union from plotly.graph_objs.scatter import Marker -from dryvr_plus_plus.analysis.analysis_tree import AnalysisTree, AnalysisTreeNode +from verse.analysis.analysis_tree import AnalysisTree, AnalysisTreeNode colors = [['#CC0000', '#FF0000', '#FF3333', '#FF6666', '#FF9999', '#FFCCCC'], ['#CCCC00', '#FFFF00', '#FFFF33', '#FFFF66', '#FFFF99', '#FFE5CC'], @@ -37,7 +37,7 @@ API These 5 functions share the same API. - root: the root node of the trace, should be the return value of Scenario.verify() or Scenario.simulate(). -- map: the map of the scenario, templates are in dryvr_plus_plus.example.example_map.simple_map2.py. +- map: the map of the scenario, templates are in verse.example.example_map.simple_map2.py. - fig: the object of the figure, its type should be plotly.graph_objects.Figure(). - x_dim: the dimension of x coordinate in the trace list of every time step. The default value is 1. - y_dim: the dimension of y coordinate in the trace list of every time step. The default value is 2. diff --git a/dryvr_plus_plus/plotter/plotter3D.py b/verse/plotter/plotter3D.py similarity index 100% rename from dryvr_plus_plus/plotter/plotter3D.py rename to verse/plotter/plotter3D.py diff --git a/dryvr_plus_plus/plotter/plotter_README.md b/verse/plotter/plotter_README.md similarity index 100% rename from dryvr_plus_plus/plotter/plotter_README.md rename to verse/plotter/plotter_README.md diff --git a/dryvr_plus_plus/reachability_engine/__init__.py b/verse/reachability_engine/__init__.py similarity index 100% rename from dryvr_plus_plus/reachability_engine/__init__.py rename to verse/reachability_engine/__init__.py diff --git a/dryvr_plus_plus/reachability_engine/dryvr.py b/verse/reachability_engine/dryvr.py similarity index 99% rename from dryvr_plus_plus/reachability_engine/dryvr.py rename to verse/reachability_engine/dryvr.py index d7e27985..85b3fd09 100644 --- a/dryvr_plus_plus/reachability_engine/dryvr.py +++ b/verse/reachability_engine/dryvr.py @@ -221,7 +221,7 @@ def calc_bloated_tube( bloating_method (str): determine the bloating method for reach tube, either GLOBAL or PW sim_trace_num (int): number of simulations used to calculate the discrepancy kvalue (list): list of float used when bloating method set to PW - guard_checker (dryvr_plus_plus.core.guard.Guard or None): guard check object + guard_checker (verse.core.guard.Guard or None): guard check object guard_str (str): guard string Returns: diff --git a/dryvr_plus_plus/reachability_engine/utils.py b/verse/reachability_engine/utils.py similarity index 100% rename from dryvr_plus_plus/reachability_engine/utils.py rename to verse/reachability_engine/utils.py diff --git a/dryvr_plus_plus/scenario/__init__.py b/verse/scenario/__init__.py similarity index 100% rename from dryvr_plus_plus/scenario/__init__.py rename to verse/scenario/__init__.py diff --git a/dryvr_plus_plus/scenario/scenario.py b/verse/scenario/scenario.py similarity index 98% rename from dryvr_plus_plus/scenario/scenario.py rename to verse/scenario/scenario.py index 0fd9905f..0c7b58ba 100644 --- a/dryvr_plus_plus/scenario/scenario.py +++ b/verse/scenario/scenario.py @@ -7,12 +7,12 @@ import ast import numpy as np -from dryvr_plus_plus.agents.base_agent import BaseAgent -from dryvr_plus_plus.automaton import GuardExpressionAst, ResetExpression -from dryvr_plus_plus.analysis import Simulator, Verifier, AnalysisTreeNode, AnalysisTree -from dryvr_plus_plus.reachability_engine.utils import find, sample_rect -from dryvr_plus_plus.sensor.base_sensor import BaseSensor -from dryvr_plus_plus.map.lane_map import LaneMap +from verse.agents.base_agent import BaseAgent +from verse.automaton import GuardExpressionAst, ResetExpression +from verse.analysis import Simulator, Verifier, AnalysisTreeNode, AnalysisTree +from verse.reachability_engine.utils import find, sample_rect +from verse.sensor.base_sensor import BaseSensor +from verse.map.lane_map import LaneMap EGO, OTHERS = "ego", "others" diff --git a/dryvr_plus_plus/sensor/__init__.py b/verse/sensor/__init__.py similarity index 100% rename from dryvr_plus_plus/sensor/__init__.py rename to verse/sensor/__init__.py diff --git a/dryvr_plus_plus/sensor/base_sensor.py b/verse/sensor/base_sensor.py similarity index 98% rename from dryvr_plus_plus/sensor/base_sensor.py rename to verse/sensor/base_sensor.py index 3be85df7..4cc9217c 100644 --- a/dryvr_plus_plus/sensor/base_sensor.py +++ b/verse/sensor/base_sensor.py @@ -1,5 +1,5 @@ import numpy as np -from dryvr_plus_plus.agents.base_agent import BaseAgent +from verse.agents.base_agent import BaseAgent def sets(d, thing, attrs, vals): -- GitLab