diff --git a/src/main.rs b/src/main.rs index d4e7487..af763c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,7 +31,7 @@ fn main() { let (pointcloud_rx, usage_extract) = create_extract_thread(img_rx, 196, 0.025); let (cluster_labels_rx, usage_cluster) = create_pointcloud_labels_thread(pointcloud_rx); let (z_rx, usage_detect) = create_mestimator_thread(cluster_labels_rx); -/* + let multi_stats = MultiProgress::new(); let p_style = ProgressStyle::default_bar().template("{prefix:15} {bar:50.gray/white} {pos:>6} us | {len:>6} us").unwrap(); let p_extract = multi_stats.add(ProgressBar::new(100).with_prefix("Extract").with_style(p_style.clone())); @@ -41,7 +41,7 @@ fn main() { let p_max = multi_stats.add(ProgressBar::new(100).with_prefix("Pipeline load").with_style(ProgressStyle::default_bar().template("{prefix:15} {bar:50.red/white} {percent:>3}%").unwrap())); let p_avg_ms = multi_stats.add(ProgressBar::new(100_000).with_prefix("Pipeline delay").with_style(ProgressStyle::default_bar().template("{prefix:15} {bar:50.cyan/white} {pos:>6} us").unwrap())); let p_framerate = multi_stats.add(ProgressBar::new(150).with_prefix("Framerate").with_style(ProgressStyle::default_bar().template("{prefix:15} {bar:50.blue/white} {pos:>3} FPS").unwrap())); -*/ + let mut t: VecDeque = VecDeque::with_capacity(25); let mut now: Instant = Instant::now(); @@ -93,7 +93,7 @@ fn main() { let u_detect = *usage_detect.lock().unwrap(); let u_vec = vec![u_extract, u_cluster, u_detect]; - /* + p_extract.set_length(u_extract.1.as_micros() as u64); p_extract.set_position(u_extract.0.as_micros() as u64); p_cluster.set_length(u_cluster.1.as_micros() as u64); @@ -104,7 +104,7 @@ fn main() { p_max.set_position(u_vec.iter().map(|(t, d)| ((t.as_secs_f64() / d.as_secs_f64()) * 100.0) as u64).max().unwrap()); p_avg_ms.set_position(u_vec.iter().map(|(t, _)| t).sum::().as_micros() as u64); p_framerate.set_position((1.0 / (t.iter().map(|d| d.as_secs_f64()).sum::() / t.len() as f64)) as u64); -*/ + if t.len() == 25 { t.pop_front(); } diff --git a/src/pipeline/hdb_clusterer.rs b/src/pipeline/hdb_clusterer.rs index f961196..63f98b4 100644 --- a/src/pipeline/hdb_clusterer.rs +++ b/src/pipeline/hdb_clusterer.rs @@ -31,7 +31,6 @@ impl SortLabeled for PointcloudLabeled { let mut average: Vec<(i32, f64)> = averages.into_iter().map(|(label, y_values)| (label, y_values.iter().sum::() / y_values.len() as f64)).collect(); average.sort_by(|(_, a), (_, b)| a.partial_cmp(&b).unwrap()); - println!("{:?}", average); let sorted_map: IndexMap<_, _> = average.iter().enumerate().map(|(new_label, (old_label, _))| (old_label, new_label)).collect(); Arc::new(self.iter()