Skip to content

Commit 658ae3d

Browse files
sergiopaniegosergiopaniego
committed
Removed lap_stats to lap_metrics
1 parent 32bc96b commit 658ae3d

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎behavior_metrics/show_plots.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
class MetricsWindow(QtWidgets.QMainWindow):
21-
def __init__(self, bag_file, x_points, y_points, first_image, bag_metadata, time_stats_metadata, lap_statistics,
21+
def __init__(self, bag_file, x_points, y_points, first_image, bag_metadata, time_stats_metadata, lap_metrics,
2222
circuit_diameter):
2323
super().__init__()
2424
self._main = QtWidgets.QWidget()
@@ -31,7 +31,7 @@ def __init__(self, bag_file, x_points, y_points, first_image, bag_metadata, time
3131
self.first_image = first_image
3232
self.bag_metadata = bag_metadata
3333
self.time_stats_metadata = time_stats_metadata
34-
self.lap_statistics = lap_statistics
34+
self.lap_metrics = lap_metrics
3535
self.circuit_diameter = circuit_diameter
3636

3737
self.setup_plot()
@@ -93,29 +93,29 @@ def add_labels(self):
9393
self.layout.addWidget(label_circuit_diameter)
9494
label_completed_distance = QLabel(
9595
'<span style=" font-size:10pt; font-weight:600; color:#000000;">Completed distance: </span>' + str(
96-
self.lap_statistics['completed_distance']))
96+
self.lap_metrics['completed_distance']))
9797
self.layout.addWidget(label_completed_distance)
9898
label_percentage_completed = QLabel(
9999
'<span style=" font-size:10pt; font-weight:600; color:#000000;">Percentage completed: </span>' + str(
100-
self.lap_statistics['percentage_completed']))
100+
self.lap_metrics['percentage_completed']))
101101
self.layout.addWidget(label_percentage_completed)
102102

103-
if 'lap_seconds' in self.lap_statistics:
103+
if 'lap_seconds' in self.lap_metrics:
104104
label_lap_seconds = QLabel(
105105
'<span style=" font-size:10pt; font-weight:600; color:#000000;">Lap seconds: </span>' + str(
106-
self.lap_statistics['lap_seconds']))
106+
self.lap_metrics['lap_seconds']))
107107
self.layout.addWidget(label_lap_seconds)
108108
label_circuit_diameter = QLabel(
109109
'<span style=" font-size:10pt; font-weight:600; color:#000000;">Circuit diameter: </span>' + str(
110-
self.lap_statistics['circuit_diameter']))
110+
self.lap_metrics['circuit_diameter']))
111111
self.layout.addWidget(label_circuit_diameter)
112112
label_average_speed = QLabel(
113113
'<span style=" font-size:10pt; font-weight:600; color:#000000;">Average speed: </span>' + str(
114-
self.lap_statistics['average_speed']))
114+
self.lap_metrics['average_speed']))
115115
self.layout.addWidget(label_average_speed)
116-
label_position_deviation_mae=QLabel('<span style=" font-size:10pt; font-weight:600; color:#000000;">Position deviation MAE: </span>' + str(self.lap_statistics['position_deviation_mae']))
116+
label_position_deviation_mae=QLabel('<span style=" font-size:10pt; font-weight:600; color:#000000;">Position deviation MAE: </span>' + str(self.lap_metrics['position_deviation_mae']))
117117
self.layout.addWidget(label_position_deviation_mae)
118-
label_position_deviation_total_err=QLabel('<span style=" font-size:10pt; font-weight:600; color:#000000;">Position deviation total ERROR: </span>' + str(self.lap_statistics['position_deviation_total_err']))
118+
label_position_deviation_total_err=QLabel('<span style=" font-size:10pt; font-weight:600; color:#000000;">Position deviation total ERROR: </span>' + str(self.lap_metrics['position_deviation_total_err']))
119119
self.layout.addWidget(label_position_deviation_total_err)
120120

121121

@@ -188,10 +188,10 @@ def show_metrics(bags, bags_checkpoints, bags_metadata, bags_lapdata, time_stats
188188
perfect_lap_path = 'lap-montmelo.bag'
189189

190190
perfect_lap_checkpoints, circuit_diameter = metrics.read_perfect_lap_rosbag(perfect_lap_path)
191-
lap_statistics = bags_lapdata[x]
192-
experiment_statistics['lap_statistics'] = lap_statistics
191+
lap_metrics = bags_lapdata[x]
192+
experiment_statistics['lap_metrics'] = lap_metrics
193193
experiments_statistics.append(experiment_statistics)
194-
if lap_statistics['percentage_completed'] > 100:
194+
if lap_metrics['percentage_completed'] > 100:
195195
if bags_metadata[x]['world'] in world_completed and \
196196
bags_metadata[x]['brain_path'] in world_completed[bags_metadata[x]['world']]:
197197
world_completed[bags_metadata[x]['world']][bags_metadata[x]['brain_path']] = \
@@ -201,18 +201,18 @@ def show_metrics(bags, bags_checkpoints, bags_metadata, bags_lapdata, time_stats
201201
else:
202202
world_completed[bags_metadata[x]['world']] = {}
203203
world_completed[bags_metadata[x]['world']][bags_metadata[x]['brain_path']] = 1
204-
if 'lap_seconds' in lap_statistics:
205-
print('LAP SECONDS -> ' + str(lap_statistics['lap_seconds']))
206-
print('CIRCUIT DIAMETER -> ' + str(lap_statistics['circuit_diameter']))
207-
print('AVERAGE SPEED -> ' + str(lap_statistics['average_speed']))
204+
if 'lap_seconds' in lap_metrics:
205+
print('LAP SECONDS -> ' + str(lap_metrics['lap_seconds']))
206+
print('CIRCUIT DIAMETER -> ' + str(lap_metrics['circuit_diameter']))
207+
print('AVERAGE SPEED -> ' + str(lap_metrics['average_speed']))
208208

209209
for point in checkpoints:
210210
point_yml = yaml.load(str(point), Loader=yaml.FullLoader)
211211
x_points.append(point_yml['pose']['pose']['position']['x'])
212212
y_points.append(point_yml['pose']['pose']['position']['y'])
213213

214214
qapp = QtWidgets.QApplication(sys.argv)
215-
app = MetricsWindow(bags[x], x_points, y_points, first_image, bags_metadata[x], time_stats[x], lap_statistics,
215+
app = MetricsWindow(bags[x], x_points, y_points, first_image, bags_metadata[x], time_stats[x], lap_metrics,
216216
circuit_diameter)
217217
app.show()
218218
qapp.exec_()

‎behavior_metrics/ui/gui/views/stats_window.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ def __init__(self, parent=None, controller=None):
1111
self.setCentralWidget(wid)
1212

1313
self.layout = QVBoxLayout()
14-
self.percentage_completed_label = QLabel("Percentage completed -> " + str(self.controller.lap_statistics['percentage_completed']) + "%")
14+
self.percentage_completed_label = QLabel("Percentage completed -> " + str(self.controller.lap_metrics['percentage_completed']) + "%")
1515
self.layout.addWidget(self.percentage_completed_label)
16-
self.completed_distance_label = QLabel("Completed distance -> " + str(self.controller.lap_statistics['completed_distance']) + "m")
16+
self.completed_distance_label = QLabel("Completed distance -> " + str(self.controller.lap_metrics['completed_distance']) + "m")
1717
self.layout.addWidget(self.completed_distance_label)
18-
self.average_speed_label = QLabel("Average speed -> " + str(self.controller.lap_statistics['average_speed']) + "m/s")
18+
self.average_speed_label = QLabel("Average speed -> " + str(self.controller.lap_metrics['average_speed']) + "m/s")
1919
self.layout.addWidget(self.average_speed_label)
20-
self.position_deviation_mae_label = QLabel("Position deviation MAE -> " + str(self.controller.lap_statistics['position_deviation_mae']))
20+
self.position_deviation_mae_label = QLabel("Position deviation MAE -> " + str(self.controller.lap_metrics['position_deviation_mae']))
2121
self.layout.addWidget(self.position_deviation_mae_label)
22-
self.position_deviation_total_err_label = QLabel("Position deviation total error -> " + str(self.controller.lap_statistics['position_deviation_total_err']))
22+
self.position_deviation_total_err_label = QLabel("Position deviation total error -> " + str(self.controller.lap_metrics['position_deviation_total_err']))
2323
self.layout.addWidget(self.position_deviation_total_err_label)
2424

2525
# If lap is completed, extend information
26-
if 'lap_seconds' in self.controller.lap_statistics:
27-
self.lap_seconds_label = QLabel("Lap seconds -> " + str(self.controller.lap_statistics['lap_seconds']) + "s")
26+
if 'lap_seconds' in self.controller.lap_metrics:
27+
self.lap_seconds_label = QLabel("Lap seconds -> " + str(self.controller.lap_metrics['lap_seconds']) + "s")
2828
self.layout.addWidget(self.lap_seconds_label)
29-
self.circuit_diameter_label = QLabel("Circuit diameter -> " + str(self.controller.lap_statistics['circuit_diameter']) + "m")
29+
self.circuit_diameter_label = QLabel("Circuit diameter -> " + str(self.controller.lap_metrics['circuit_diameter']) + "m")
3030
self.layout.addWidget(self.circuit_diameter_label)
3131

3232
wid.setLayout(self.layout)

‎behavior_metrics/utils/script_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def run_brains_worlds(app_configuration, controller, randomize=False):
116116
if hasattr(app_configuration, 'experiment_model'):
117117
logger.info('* Model ---> ' + app_configuration.experiment_model[brain_counter])
118118
if not pitch_error:
119-
logger.info('* Metrics ---> ' + str(controller.lap_statistics))
119+
logger.info('* Metrics ---> ' + str(controller.lap_metrics))
120120
repetition_counter += 1
121121
os.remove('tmp_circuit.launch')
122122
os.remove('tmp_world.launch')

0 commit comments

Comments
 (0)