@@ -43,7 +43,12 @@ def complete_given_xy(x, y, params, planning_params):
4343
4444
4545def compute_trajectory_stats (
46- trajectory , duration , params , planning_params , min_dist_travelled = 150
46+ trajectory ,
47+ duration ,
48+ params ,
49+ planning_params ,
50+ min_dist_travelled = 150 ,
51+ mute = False ,
4752):
4853 # Compute stats
4954 n_points = len (trajectory )
@@ -85,46 +90,59 @@ def compute_trajectory_stats(
8590 )
8691
8792 # log stuff
88- logger .info (
89- f"""
90- Trajectory metadata
91-
92-
93- n_points = { n_points }
94- distance_travelled = { round (distance_travelled , 2 )}
95- waypoint_density = { round (waypoint_density , 2 )}
96- start_goal_distance = { round (start_goal_distance , 2 )}
97- duration = { round (duration , 2 )}
98- lookahead = { lookahead }
99- perc_lookahead = { perc_lookahead }
100- """
101- )
102- print (table )
103-
104- if waypoint_density < 2 or waypoint_density > 3 :
93+ if not mute :
10594 logger .info (
106- f"Waypoint density of { round (waypoint_density , 3 )} out of range, it should be 2 < wp < 3!" ,
107- extra = {"markdown" : True },
108- )
109- print (
110- f"[bold red]Waypoint density of { round (waypoint_density , 3 )} out of range, it should be 2 < wp < 3!"
95+ f"""
96+ Trajectory metadata
97+
98+
99+ n_points = { n_points }
100+ distance_travelled = { round (distance_travelled , 2 )}
101+ waypoint_density = { round (waypoint_density , 2 )}
102+ start_goal_distance = { round (start_goal_distance , 2 )}
103+ duration = { round (duration , 2 )}
104+ lookahead = { lookahead }
105+ perc_lookahead = { perc_lookahead }
106+ """
111107 )
112108
113- if perc_lookahead < 0.05 :
114- logger .info (
115- f"Lookahead of { lookahead } is { perc_lookahead } of the # of waypoints, that might be too low. Values closer to 5% are advised." ,
116- extra = {"markdown" : True },
117- )
118- print (
119- f"[bold red]Lookahead of { lookahead } is { perc_lookahead } of the # of waypoints, that might be too low. Values closer to 5% are advised."
120- )
121- if distance_travelled < min_dist_travelled * params ["px_to_cm" ]:
122- logger .warning (
123- "Distance travelled below minimal requirement, erroring"
124- )
125- return None , None
109+ print (table )
126110
127- return trajectory , duration
111+ metadata = dict (
112+ n_points = n_points ,
113+ distance_travelled = round (distance_travelled , 2 ),
114+ waypoint_density = round (waypoint_density , 2 ),
115+ start_goal_distance = round (start_goal_distance , 2 ),
116+ duration = round (duration , 2 ),
117+ lookahead = lookahead ,
118+ perc_lookahead = perc_lookahead ,
119+ )
120+
121+ if not mute :
122+ if waypoint_density < 2 or waypoint_density > 3 :
123+ logger .info (
124+ f"Waypoint density of { round (waypoint_density , 3 )} out of range, it should be 2 < wp < 3!" ,
125+ extra = {"markdown" : True },
126+ )
127+ print (
128+ f"[bold red]Waypoint density of { round (waypoint_density , 3 )} out of range, it should be 2 < wp < 3!"
129+ )
130+
131+ if perc_lookahead < 0.05 :
132+ logger .info (
133+ f"Lookahead of { lookahead } is { perc_lookahead } of the # of waypoints, that might be too low. Values closer to 5% are advised." ,
134+ extra = {"markdown" : True },
135+ )
136+ print (
137+ f"[bold red]Lookahead of { lookahead } is { perc_lookahead } of the # of waypoints, that might be too low. Values closer to 5% are advised."
138+ )
139+ if distance_travelled < min_dist_travelled * params ["px_to_cm" ]:
140+ logger .warning (
141+ "Distance travelled below minimal requirement, erroring"
142+ )
143+ return None , None
144+
145+ return trajectory , duration , metadata
128146
129147
130148# ---------------------------------- Curves ---------------------------------- #
@@ -253,6 +271,6 @@ def from_tracking(n_steps, params, planning_params, cache_fld, *args):
253271 return (
254272 compute_trajectory_stats (
255273 trajectory , len (x [start :]) / fps , params , planning_params
256- ),
274+ )[: 2 ] ,
257275 trials ,
258276 )
0 commit comments