Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugger in Bevy #22

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
[workspace]
members = [
"mapf",
"mapf-viz",
]
members = [ "mapf", "mapf-rse"]

resolver = "2"
File renamed without changes.
12 changes: 12 additions & 0 deletions mapf-rse/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "mapf-rse"
version = "0.1.0"
edition = "2021"

[dependencies]
mapf = { path="../mapf" }
rmf_site_format = { git = "https://github.com/reuben-thomas/rmf_site.git", branch = "scenarios", package = "rmf_site_format" }
rmf_site_editor = { git = "https://github.com/reuben-thomas/rmf_site.git", branch = "scenarios", package = "rmf_site_editor" }
bevy = { version = "0.12", features = ["pnm", "jpeg", "tga"] }
bevy_egui = "0.23.0"
futures-lite = "2.3.0"
239 changes: 239 additions & 0 deletions mapf-rse/src/config_widget.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
/*
* Copyright (C) 2024 Open Source Robotics Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

use super::*;
use bevy::{ecs::system::SystemParam, prelude::*};
use bevy_egui::egui::{CollapsingHeader, ComboBox, DragValue, Grid as EguiGrid, Ui};
use rmf_site_editor::{
occupancy::{CalculateGrid, Grid},
site::{CurrentLevel, Group, MobileRobotMarker, Task, Tasks},
widgets::prelude::*,
};

#[derive(SystemParam)]
pub struct MapfConfigWidget<'w, 's> {
simulation_config: ResMut<'w, SimulationConfig>,
debug_mode: Res<'w, State<DebugMode>>,
debug_mode_next: ResMut<'w, NextState<DebugMode>>,
mobile_robots:
Query<'w, 's, (Entity, &'static Tasks<Entity>), (With<MobileRobotMarker>, Without<Group>)>,
current_level: Res<'w, CurrentLevel>,
grids: Query<'w, 's, (Entity, &'static Grid)>,
calculate_grid: EventWriter<'w, CalculateGrid>,
parents: Query<'w, 's, &'static Parent>,
negotiation_request: EventWriter<'w, NegotiationRequest>,
negotiation_params: ResMut<'w, NegotiationParams>,
negotiation_data: ResMut<'w, NegotiationData>,
negotiation_debug: ResMut<'w, NegotiationDebugData>,
}

impl<'w, 's> WidgetSystem<Tile> for MapfConfigWidget<'w, 's> {
fn show(_: Tile, ui: &mut Ui, state: &mut SystemState<Self>, world: &mut World) -> () {
let mut params = state.get_mut(world);
ui.separator();

CollapsingHeader::new("MAPF Configuration")
.default_open(true)
.show(ui, |ui| {
ui.horizontal(|ui| {
ui.label("Mode");
ComboBox::from_id_source("mapf_debug_mode")
.selected_text(params.debug_mode.get().label())
.show_ui(ui, |ui| {
for label in DebugMode::labels() {
if ui
.selectable_label(
params.debug_mode.get().label() == label,
label,
)
.clicked()
{
params.debug_mode_next.set(DebugMode::from_label(label));
}
}
});
});

match params.debug_mode.get() {
DebugMode::Negotiation => params.show_negotiation(ui),
DebugMode::Planner => params.show_planner(ui),
}
});
}
}

impl<'w, 's> MapfConfigWidget<'w, 's> {
pub fn show_negotiation(&mut self, ui: &mut Ui) {
// Debug Parameters
// Visualize
ui.horizontal(|ui| {
ui.label("Visualize");
ui.checkbox(
&mut self.negotiation_debug.visualize_trajectories,
"Trajectories",
);
ui.checkbox(&mut self.negotiation_debug.visualize_conflicts, "Conflicts");
ui.checkbox(&mut self.negotiation_debug.visualize_keys, "Keys")
});
// Toggle debug panel
ui.horizontal(|ui| {
ui.label("Debug Panel");
ui.checkbox(&mut self.negotiation_debug.show_debug_panel, "Enabled");
});

// Negotiation Request Properties
// Agent tasks
ui.separator();
let num_tasks = self
.mobile_robots
.iter()
.filter(|(_, tasks)| {
tasks.0.iter().any(|task| {
if let Task::GoToPlace { location: _ } = task {
true
} else {
false
}
})
})
.count();
ui.label(format!("Tasks: {}", num_tasks));
// Grid Info
let occupancy_grid = self
.grids
.iter()
.filter_map(|(grid_entity, grid)| {
if let Some(level_entity) = self.current_level.0 {
if self
.parents
.get(grid_entity)
.is_ok_and(|parent_entity| parent_entity.get() == level_entity)
{
Some(grid)
} else {
None
}
} else {
None
}
})
.next();
ui.horizontal(|ui| {
ui.label("Cell Size: ");
if ui
.add(
DragValue::new(&mut self.negotiation_params.cell_size)
.clamp_range(0.1..=1.0)
.suffix(" m")
.speed(0.01),
)
.changed()
{
self.calculate_grid.send(CalculateGrid {
cell_size: self.negotiation_params.cell_size,
floor: 0.01,
ceiling: 1.5,
ignore: Some(
self.mobile_robots
.iter()
.map(|(entity, _)| entity)
.collect(),
),
});
}
});
ui.label("Occupancy");
ui.indent("occupancy_grid_info", |ui| {
if let Some(grid) = occupancy_grid {
EguiGrid::new("occupancy_map_info")
.num_columns(2)
.show(ui, |ui| {
ui.label("range");
ui.label(format!("{:?}", grid.range.min_cell()));
ui.end_row();
ui.label("max cell");
ui.label(format!("{:?}", grid.range.max_cell()));
ui.end_row();
ui.label("dimension");
ui.label(format!(
"{} x {}",
grid.range.max_cell().x - grid.range.min_cell().x,
grid.range.max_cell().y - grid.range.min_cell().y
));
ui.end_row();
});
} else {
ui.label("None");
}
});
// Generate Plan
ui.horizontal(|ui| {
let allow_generate_plan = num_tasks > 0
&& self.negotiation_params.queue_length_limit > 0
&& !self.negotiation_data.is_in_progress();

ui.add_enabled_ui(allow_generate_plan, |ui| {
if ui.button("Generate Plan").clicked() {
self.negotiation_request.send(NegotiationRequest);
}
});
ui.add(
DragValue::new(&mut self.negotiation_params.queue_length_limit)
.clamp_range(0..=std::usize::MAX)
.speed(1000),
);
});

// Results
ui.separator();
match self.negotiation_data.as_ref() {
NegotiationData::Complete {
elapsed_time,
solution,
negotiation_history,
entity_id_map,
error_message,
conflicting_endpoints,
} => {
EguiGrid::new("negotiation_data")
.num_columns(2)
.show(ui, |ui| {
ui.label("execution time");
ui.label(format!("{:.2} s", elapsed_time.as_secs_f32()));
ui.end_row();
ui.label("negotiation history");
ui.label(format!("{}", negotiation_history.len()));
ui.end_row();
ui.label("endpoint conflicts");
ui.label(format!("{}", conflicting_endpoints.len()));
ui.end_row();
ui.label("error message");
ui.label(error_message.clone().unwrap_or("None".to_string()));
});
}
NegotiationData::InProgress { start_time } => {
let elapsed_time = start_time.elapsed();
ui.label(format!("In Progress: {}", elapsed_time.as_secs_f32()));
}
_ => {}
}
}

pub fn show_planner(&mut self, ui: &mut Ui) {
ui.label("Unavailable");
}
}
93 changes: 93 additions & 0 deletions mapf-rse/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright (C) 2024 Open Source Robotics Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

pub mod negotiation;
pub use negotiation::*;

pub mod config_widget;
pub use config_widget::*;

pub mod misc;
pub use misc::*;

use rmf_site_editor::widgets::PropertiesTilePlugin;

use bevy::prelude::*;

#[derive(Default)]
pub struct MapfRsePlugin;

impl Plugin for MapfRsePlugin {
fn build(&self, app: &mut App) {
app.add_state::<DebugMode>()
.init_resource::<SimulationConfig>()
.add_plugins(NegotiationPlugin)
.add_plugins(PropertiesTilePlugin::<MapfConfigWidget>::new())
.add_systems(Update, load_tiny_robot);
}
}

#[derive(Resource, Debug, Clone)]
pub struct SimulationConfig {
pub is_playing: bool,
pub speed: f32,
pub current_time: f32,
pub end_time: f32,
pub current_step: u32,
pub end_step: u32,
}

impl Default for SimulationConfig {
fn default() -> Self {
Self {
is_playing: false,
speed: 1.0,
current_time: 0.0,
end_time: 0.0,
current_step: 0,
end_step: 0,
}
}
}

#[derive(Clone, Default, Eq, PartialEq, Debug, Hash, States)]
pub enum DebugMode {
#[default]
Negotiation,
Planner,
}

impl DebugMode {
pub fn labels() -> Vec<&'static str> {
vec!["Negotiation", "Planner"]
}

pub fn label(&self) -> &str {
match self {
DebugMode::Negotiation => Self::labels()[0],
DebugMode::Planner => Self::labels()[1],
}
}

pub fn from_label(label: &str) -> Self {
if label == Self::labels()[0] {
return DebugMode::Negotiation;
} else {
return DebugMode::Planner;
}
}
}
Loading