Checkpoint 6
This commit is contained in:
@@ -11,14 +11,14 @@ _PROJECT_ROOT = os.path.normpath(os.path.join(_HERE, "..", ".."))
|
||||
if _PROJECT_ROOT not in sys.path:
|
||||
sys.path.insert(0, _PROJECT_ROOT)
|
||||
|
||||
from herding.flocking_sim import ( # noqa: F401
|
||||
from herding.world.flocking_sim import ( # noqa: F401
|
||||
MAX_SPEED, FLEE_SPEED, WANDER_SPEED,
|
||||
WALL_MARGIN, WALL_HARD_MARGIN, WALL_HARD_GAIN,
|
||||
FLEE_DIST, SEPARATION_DIST, COHESION_DIST,
|
||||
PEN_MARGIN,
|
||||
compute_heading_speed,
|
||||
)
|
||||
from herding.geometry import ( # noqa: F401
|
||||
from herding.world.geometry import ( # noqa: F401
|
||||
FIELD_X, FIELD_Y, PEN_X, PEN_Y,
|
||||
in_pen,
|
||||
)
|
||||
|
||||
@@ -24,9 +24,9 @@ if _PROJECT_ROOT not in sys.path:
|
||||
|
||||
from controller import Supervisor
|
||||
|
||||
from herding.diffdrive import heading_speed_to_wheels
|
||||
from herding.flocking_sim import MAX_SPEED, compute_heading_speed
|
||||
from herding.geometry import (
|
||||
from herding.world.diffdrive import heading_speed_to_wheels
|
||||
from herding.world.flocking_sim import MAX_SPEED, compute_heading_speed
|
||||
from herding.world.geometry import (
|
||||
SHEEP_MAX_WHEEL_OMEGA,
|
||||
is_penned_position,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user