Add missing table info (#2)

* Add missing info * Fmt and clippy suggestions
uo272509 · Oct 30, 2023 · 4786938 · 4786938
1 parent a8a815d
commit 4786938
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tcpreno"
 authors = ["margual56@gmail.com"]
-version = "1.1.0"
+version = "1.1.1"
 license = "GPL-2.0"
 edition = "2021"
 

diff --git a/src/app.rs b/src/app.rs
@@ -1,4 +1,4 @@
-use crate::algorithm;
+use crate::{algorithm, to_csv};
 use eframe::egui;
 use egui_extras::{Column, TableBuilder};
 use egui_plot::{Legend, Line, LineStyle, VLine};
@@ -169,8 +169,15 @@ impl eframe::App for App {
 
             ui.horizontal(|ui| {
                 ui.label("Algorithm:");
-                ui.radio_value(&mut self.algorithm, Algorithm::Reno, "Reno");
-                ui.radio_value(&mut self.algorithm, Algorithm::Tahoe, "Tahoe");
+                if ui
+                    .radio_value(&mut self.algorithm, Algorithm::Reno, "Reno")
+                    .clicked()
+                    || ui
+                        .radio_value(&mut self.algorithm, Algorithm::Tahoe, "Tahoe")
+                        .clicked()
+                {
+                    self.update_data();
+                }
             });
 
             ui.collapsing("Edit cycles where there are losses", |ui| {
@@ -251,6 +258,78 @@ impl eframe::App for App {
                             .style(LineStyle::dashed_dense()),
                     );
                 });
+
+            ui.separator();
+
+            ui.horizontal_centered(|ui| {
+                ui.vertical_centered_justified(|ui| {
+                    TableBuilder::new(ui)
+                        .striped(true)
+                        .auto_shrink([true, true])
+                        .column(Column::auto())
+                        .column(Column::auto())
+                        .column(Column::auto())
+                        .column(Column::auto())
+                        .header(30.0, |mut header| {
+                            header.col(|ui| {
+                                ui.heading("Cycle");
+                            });
+                            header.col(|ui| {
+                                ui.heading("Window size");
+                            });
+                            header.col(|ui| {
+                                ui.heading("Threshold");
+                            });
+                            header.col(|ui| {
+                                ui.heading("Has loss?");
+                            });
+                        })
+                        .body(|mut body| {
+                            for (i, (window, threshold)) in self
+                                .window_size_data
+                                .iter()
+                                .zip(self.threshold_data.iter())
+                                .enumerate()
+                            {
+                                body.row(30.0, |mut row| {
+                                    row.col(|ui| {
+                                        ui.label(i.to_string());
+                                    });
+
+                                    row.col(|ui| {
+                                        ui.label(window[1].to_string());
+                                    });
+
+                                    row.col(|ui| {
+                                        ui.label(threshold[1].to_string());
+                                    });
+
+                                    row.col(|ui| {
+                                        ui.label(if self.losses.contains(&(i as u16)) {
+                                            "Yes"
+                                        } else {
+                                            ""
+                                        });
+                                    });
+                                });
+                            }
+                        });
+                });
+
+                ui.separator();
+
+                ui.vertical_centered_justified(|ui| {
+                    ui.push_id("CSV scroll", |ui| {
+                        egui::ScrollArea::vertical().show(ui, |ui| {
+                            ui.text_edit_multiline(&mut to_csv(
+                                &self.window_size_data,
+                                &self.threshold_data,
+                                &self.losses,
+                            ));
+                        });
+                    });
+                });
+            });
         });
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -43,16 +43,20 @@ pub fn algorithm(
     (window_sizes, thresholds)
 }
 
-pub fn to_csv(window_sizes: Vec<u16>, thresholds: Vec<u16>, losses: Vec<usize>) -> String {
+pub fn to_csv(window_sizes: &[[f64; 2]], thresholds: &[[f64; 2]], losses: &[u16]) -> String {
     let mut csv = String::new();
     csv.push_str("Cycle;Window size;Threshold;Packet losses\n");
     for (i, (window, threshold)) in window_sizes.iter().zip(thresholds.iter()).enumerate() {
         csv.push_str(&format!(
             "{};{};{};{}\n",
             i,
-            window,
-            threshold,
-            if losses.contains(&i) { "Loss" } else { "" }
+            window[1],
+            threshold[1],
+            if losses.contains(&(i as u16)) {
+                "Loss"
+            } else {
+                ""
+            }
         ));
     }
     csv