2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

move distance calculation

Browse source
This commit is contained in:
Laura Klünder 2016-12-27 01:24:11 +01:00
parent 2de2b81440
commit 3a44985840
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/c3nav/routing/area.py
View file

@ -31,20 +31,21 @@ class GraphArea():
def build_connections(self): def build_connections(self):
for point1, point2 in combinations(self._built_points, 2): for point1, point2 in combinations(self._built_points, 2):
there, back = self.check_connection(point1.xy, point2.xy) there, back, distance = self.check_connection(point1.xy, point2.xy)
if there is not None: if there is not None:
point1.connect_to(point2, ctype=there) point1.connect_to(point2, distance=distance, ctype=there)
if back is not None: if back is not None:
point2.connect_to(point1, ctype=back) point2.connect_to(point1, distance=distance, ctype=back)
def check_connection(self, point1, point2): def check_connection(self, point1, point2):
path = Path(np.vstack((point1, point2))) path = Path(np.vstack((point1, point2)))
distance = abs(np.linalg.norm(point1 - point2))
# lies within room # lies within room
if self.mpl_clear.intersects_path(path): if self.mpl_clear.intersects_path(path):
return None, None return None, None, None
# stair checker # stair checker
angle = coord_angle(point1, point2) angle = coord_angle(point1, point2)
@ -59,10 +60,10 @@ class GraphArea():
if stair_direction_up is None: if stair_direction_up is None:
stair_direction_up = new_direction_up stair_direction_up = new_direction_up
elif stair_direction_up != new_direction_up: elif stair_direction_up != new_direction_up:
return None, None return None, None, None
if not (40 < abs(angle_diff) < 150): if not (40 < abs(angle_diff) < 150):
return None, None return None, None, None
# escalator checker # escalator checker
angle = coord_angle(point1, point2) angle = coord_angle(point1, point2)
@ -74,7 +75,7 @@ class GraphArea():
if escalator_direction_up is not None: if escalator_direction_up is not None:
# only one escalator per connection # only one escalator per connection
return None, None return None, None, None
angle_diff = ((escalator.angle - angle + 180) % 360) - 180 angle_diff = ((escalator.angle - angle + 180) % 360) - 180
@ -85,14 +86,15 @@ class GraphArea():
return ( return (
('stairs_up' if stair_direction_up else 'stairs_down'), ('stairs_up' if stair_direction_up else 'stairs_down'),
('stairs_down' if stair_direction_up else 'stairs_up'), ('stairs_down' if stair_direction_up else 'stairs_up'),
distance,
) )
elif escalator_direction_up is not None: elif escalator_direction_up is not None:
if not escalator_swap_direction: if not escalator_swap_direction:
return ('escalator_up' if escalator_direction_up else 'escalator_down'), None return ('escalator_up' if escalator_direction_up else 'escalator_down'), None, distance
else: else:
return None, ('escalator_down' if escalator_direction_up else 'escalator_up') return None, ('escalator_down' if escalator_direction_up else 'escalator_up'), distance
return '', '' return '', '', distance
def add_point(self, point): def add_point(self, point):
if not self.mpl_clear.contains_point(point.xy): if not self.mpl_clear.contains_point(point.xy):
@ -115,9 +117,8 @@ class GraphArea():
for point_i in self.points: for point_i in self.points:
other_point = self.graph.points[point_i] other_point = self.graph.points[point_i]
there, back = self.check_connection(point, other_point.xy) there, back, distance = self.check_connection(point, other_point.xy)
ctype = there if mode == 'orig' else back ctype = there if mode == 'orig' else back
if ctype is not None: if ctype is not None:
distance = abs(np.linalg.norm(point - other_point.xy))
connections[point_i] = (distance, ctype) connections[point_i] = (distance, ctype)
return connections return connections

2
src/c3nav/routing/room.py
View file

@ -319,7 +319,7 @@ class GraphRoom():
to_point = np.array(to_point) to_point = np.array(to_point)
for area in self.areas: for area in self.areas:
if area.contains_point(from_point) and area.contains_point(to_point): if area.contains_point(from_point) and area.contains_point(to_point):
there, back = area.check_connection(from_point, to_point) there, back, distance = area.check_connection(from_point, to_point)
if there is not None: if there is not None:
return there return there
return None return None