Merge pull request #100 from humphreylee/Add_dz!_macro

Add dz! macro to construct (multiple dimensions) ECharts DataFrame from any number of data vectors/ columns
yuankunzhang · Oct 28, 2024 · d890161 · d890161
2 parents 8d669d5 + fd86e46
commit d890161
Show file tree

Hide file tree

Showing 3 changed files with 293 additions and 0 deletions.
diff --git a/charming/src/datatype/dataframe.rs b/charming/src/datatype/dataframe.rs
@@ -69,3 +69,69 @@ macro_rules! df {
         ]
     };
 }
+
+/// Code below is modified (using df! as reference) from ChatGPT generated code.
+/// The main objective of macro dz! is to transpose mixed data type vectors,
+/// aka columns or dimensions into ECharts dataframe format.
+
+#[macro_export]
+macro_rules! dz {
+    /*
+    Handle named vectors
+    let d1 = vec![44056, 13334];
+    let d2 = vec![81.8, 76.9];
+    let d3 = vec![23968973, 1376048943];
+    let d4 = vec!["Australia", "China"];
+    let d5 = vec![2015, 2015];
+    let df = dz!(d1, d2, d3, d4, d5);
+    >>df = [Value(Array([Number(Integer(44056)), Number(Float(81.8)),
+    Number(Integer(23968973)), String("Australia"), Number(Integer(2015))])),
+    Value(Array([Number(Integer(13334)), Number(Float(76.9)),
+    Number(Integer(1376048943)), String("China"), Number(Integer(2015))]))]
+    */
+    ($($v:expr),* $(,)?) => {{
+        let mut df = Vec::new();
+        let mut iterators: Vec<Box<dyn Iterator<Item = $crate::datatype::CompositeValue>>> = vec![
+            $(Box::new($v.into_iter().map(|x| $crate::datatype::CompositeValue::from(x))),)*
+        ];
+
+        let len = iterators.first().map(|v| v.size_hint().0).unwrap_or(0);
+
+        for _ in 0..len {
+            let mut row = Vec::new();
+            for iter in iterators.iter_mut() {
+                if let Some(value) = iter.next() {
+                    row.push(value);
+                }
+            }
+            let z = $crate::datatype::DataPoint::from(row);
+            df.push(z);
+        }
+        df
+    }};
+
+    /*
+    Handle direct input of vectors
+    let df = dz!([44056, 13334], [81.8, 76.9], [23968973, 1376048943], ["Australia", "China"], [2015, 2015]);
+    >>df = [Value(Array([Number(Integer(44056)), Number(Float(81.8)),
+    Number(Integer(23968973)), String("Australia"), Number(Integer(2015))])),
+    Value(Array([Number(Integer(13334)), Number(Float(76.9)),
+    Number(Integer(1376048943)), String("China"), Number(Integer(2015))]))]
+    */
+    ($([$($v:expr),*]),* $(,)?) => {{
+        let mut df = Vec::new();
+        let mut iterators: Vec<_> = vec![$(vec![$($v.into()),*].into_iter()),*];
+
+        let len = iterators.first().map(|v| v.len()).unwrap_or(0);
+        for _ in 0..len {
+            let mut row = Vec::new();
+            for iter in &mut iterators {
+                if let Some($crate::datatype::CompositeValue) = iter.next() {
+                    row.push($crate::datatype::CompositeValue);
+                }
+            }
+            df.push(row);
+        }
+        df
+    }};
+}
diff --git a/charming/tests/dz_test.rs b/charming/tests/dz_test.rs
@@ -0,0 +1,53 @@
+#[cfg(test)]
+mod tests {
+
+    use charming::{df, dz};
+
+    /// Testing using snippt of data from https://github.com/yuankunzhang/charming/blob/main/gallery/src/scatter/bubble_chart.rs.
+    /// dz_test1 is testing input as named_variable of various data type vectors.
+    /// dz_test2 is testing input as direct input of various data type vectors.
+    /// The result of dz! are checked againt df!'s result - which should be equal.
+
+    #[test]
+    fn dz_test1() {
+        // Set up test data
+        let d1 = vec![44056, 13334];
+        let d2 = vec![81.8, 76.9];
+        let d3 = vec![23968973, 1376048943];
+        let d4 = vec!["Australia", "China"];
+        let d5 = vec![2015, 2015];
+
+        // expected output
+        let df_out = df![
+            [44056, 81.8, 23968973, "Australia", 2015],
+            [13334, 76.9, 1376048943, "China", 2015]
+        ];
+
+        // Call the macro
+        let dz_out = dz!(d1, d2, d3, d4, d5);
+
+        // Assert expected output
+        assert_eq!(dz_out, df_out);
+    }
+
+    #[test]
+    fn dz_test2() {
+        // expected output
+        let df_out = df![
+            [44056, 81.8, 23968973, "Australia", 2015],
+            [13334, 76.9, 1376048943, "China", 2015]
+        ];
+
+        // Call the macro
+        let dz_out = dz!(
+            [44056, 13334],
+            [81.8, 76.9],
+            [23968973, 1376048943],
+            ["Australia", "China"],
+            [2015, 2015]
+        );
+
+        // Assert expected output
+        assert_eq!(dz_out, df_out);
+    }
+}
diff --git a/gallery/src/scatter/bubble_chart2.rs.rs b/gallery/src/scatter/bubble_chart2.rs.rs
@@ -0,0 +1,174 @@
+use charming::{
+    component::{Axis, Grid, Legend, Title},
+    df, dz,
+    element::{
+        Color, ColorStop, Emphasis, EmphasisFocus, Formatter, ItemStyle, Label, LabelPosition,
+        LineStyle, LineStyleType, SplitLine,
+    },
+    series::Scatter,
+    Chart,
+    HtmlRenderer,
+};
+
+fn main() {
+    let chartx = chart();
+    let mut renderer = HtmlRenderer::new("My Chart", 1000, 800);
+    renderer.save(&chartx, "./chart.html").unwrap();
+
+}
+
+pub fn chart() -> Chart {
+    /*
+    let data0 = df![
+        [28604, 77, 17096869, "Australia", 1990],
+        [31163, 77.4, 27662440, "Canada", 1990],
+        [1516, 68, 1154605773, "China", 1990],
+        [13670, 74.7, 10582082, "Cuba", 1990],
+        [28599, 75, 4986705, "Finland", 1990],
+        [29476, 77.1, 56943299, "France", 1990],
+        [31476, 75.4, 78958237, "Germany", 1990],
+        [28666, 78.1, 254830, "Iceland", 1990],
+        [1777, 57.7, 870601776, "India", 1990],
+        [29550, 79.1, 122249285, "Japan", 1990],
+        [2076, 67.9, 20194354, "North Korea", 1990],
+        [12087, 72, 42972254, "South Korea", 1990],
+        [24021, 75.4, 3397534, "New Zealand", 1990],
+        [43296, 76.8, 4240375, "Norway", 1990],
+        [10088, 70.8, 38195258, "Poland", 1990],
+        [19349, 69.6, 147568552, "Russia", 1990],
+        [10670, 67.3, 53994605, "Turkey", 1990],
+        [26424, 75.7, 57110117, "United Kingdom", 1990],
+        [37062, 75.4, 252847810, "United States", 1990]
+    ];
+    let data1 = df![
+        [44056, 81.8, 23968973, "Australia", 2015],
+        [43294, 81.7, 35939927, "Canada", 2015],
+        [13334, 76.9, 1376048943, "China", 2015],
+        [21291, 78.5, 11389562, "Cuba", 2015],
+        [38923, 80.8, 5503457, "Finland", 2015],
+        [37599, 81.9, 64395345, "France", 2015],
+        [44053, 81.1, 80688545, "Germany", 2015],
+        [42182, 82.8, 329425, "Iceland", 2015],
+        [5903, 66.8, 1311050527, "India", 2015],
+        [36162, 83.5, 126573481, "Japan", 2015],
+        [1390, 71.4, 25155317, "North Korea", 2015],
+        [34644, 80.7, 50293439, "South Korea", 2015],
+        [34186, 80.6, 4528526, "New Zealand", 2015],
+        [64304, 81.6, 5210967, "Norway", 2015],
+        [24787, 77.3, 38611794, "Poland", 2015],
+        [23038, 73.13, 143456918, "Russia", 2015],
+        [19360, 76.5, 78665830, "Turkey", 2015],
+        [38225, 81.4, 64715810, "United Kingdom", 2015],
+        [53354, 79.1, 321773631, "United States", 2015]
+    ];
+    */
+    let data0_gdp = vec![28604, 31163, 1516, 13670, 28599, 29476, 31476, 28666, 1777, 29550, 2076, 12087, 24021, 43296, 10088, 19349, 10670, 26424, 37062];
+    let data0_expectancy = vec![77.0, 77.4, 68.0, 74.7, 75.0, 77.1, 75.4, 78.1, 57.7, 79.1, 67.9, 72.0, 75.4, 76.8, 70.8, 69.6, 67.3, 75.7, 75.4];
+    let data0_population = vec![17096869, 27662440, 1154605773, 10582082, 4986705, 56943299, 78958237, 254830, 870601776, 122249285, 20194354, 42972254, 3397534, 4240375, 38195258, 147568552, 53994605, 57110117, 252847810];
+    let data0_country = vec!["Australia", "Canada", "China", "Cuba", "Finland", "France", "Germany", "Iceland", "India", "Japan", "North Korea", "South Korea", "New Zealand", "Norway", "Poland", "Russia", "Turkey", "United Kingdom", "United States"];
+    let data0_year = vec![1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990];
+
+    let data1_gdp = vec![44056, 43294, 13334, 21291, 38923, 37599, 44053, 42182, 5903, 36162, 1390, 34644, 34186, 64304, 24787, 23038, 19360, 38225, 53354];
+    let data1_expectancy = vec![81.8, 81.7, 76.9, 78.5, 80.8, 81.9, 81.1, 82.8, 66.8, 83.5, 71.4, 80.7, 80.6, 81.6, 77.3, 73.13, 76.5, 81.4, 79.1];
+    let data1_population = vec![23968973, 35939927, 1376048943, 11389562, 5503457, 64395345, 80688545, 329425, 1311050527, 126573481, 25155317, 50293439, 4528526, 5210967, 38611794, 143456918, 78665830, 64715810, 321773631];
+    let data1_country = vec!["Australia", "Canada", "China", "Cuba", "Finland", "France", "Germany", "Iceland", "India", "Japan", "North Korea", "South Korea", "New Zealand", "Norway", "Poland", "Russia", "Turkey", "United Kingdom", "United States"];
+    let data1_year = vec![2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015, 2015];
+
+    let data0 = dz!(data0_gdp, data0_expectancy, data0_population, data0_country, data0_year);
+    let data1 = dz!(data1_gdp, data1_expectancy, data1_population, data1_country, data1_year);
+
+    Chart::new()
+        .title(
+            Title::new()
+                .text("Life Expectancy and GDP by Country")
+                .left("5%")
+                .top("3%"),
+        )
+        .legend(
+            Legend::new()
+                .right("10%")
+                .top("3%")
+                .data(vec!["1990", "2015"]),
+        )
+        .grid(Grid::new().left("8%").top("10%"))
+        .background_color(Color::RadialGradient {
+            x: 0.3,
+            y: 0.3,
+            r: 0.8,
+            color_stops: vec![ColorStop::new(0, "#f7f8fa"), ColorStop::new(1, "#cdd0d5")],
+        })
+        .x_axis(
+            Axis::new().split_line(
+                SplitLine::new().line_style(LineStyle::new().type_(LineStyleType::Dashed)),
+            ),
+        )
+        .y_axis(
+            Axis::new()
+                .split_line(
+                    SplitLine::new().line_style(LineStyle::new().type_(LineStyleType::Dashed)),
+                )
+                .scale(true),
+        )
+        .series(
+            Scatter::new()
+                .name("1990")
+                .data(data0)
+                .symbol_size("function (data) { return Math.sqrt(data[2]) / 5e2; }")
+                .emphasis(
+                    Emphasis::new().focus(EmphasisFocus::Series).label(
+                        Label::new()
+                            .show(true)
+                            .formatter(Formatter::Function(
+                                "function (param) { return param.data[3]; }".into(),
+                            ))
+                            .position(LabelPosition::Top),
+                    ),
+                )
+                .item_style(
+                    ItemStyle::new()
+                        .shadow_blur(10)
+                        .shadow_color("rgba(120, 36, 50, 0.5)")
+                        .shadow_offset_y(5)
+                        .color(Color::RadialGradient {
+                            x: 0.4,
+                            y: 0.3,
+                            r: 1.,
+                            color_stops: vec![
+                                ColorStop::new(0, "rgb(251, 118, 123)"),
+                                ColorStop::new(1, "rgb(204, 46, 72)"),
+                            ],
+                        }),
+                ),
+        )
+        .series(
+            Scatter::new()
+                .name("2015")
+                .data(data1)
+                .symbol_size("function (data) { return Math.sqrt(data[2]) / 5e2; }")
+                .emphasis(
+                    Emphasis::new().focus(EmphasisFocus::Series).label(
+                        Label::new()
+                            .show(true)
+                            .formatter(Formatter::Function(
+                                "function (param) { return param.data[3]; }".into(),
+                            ))
+                            .position(LabelPosition::Top),
+                    ),
+                )
+                .item_style(
+                    ItemStyle::new()
+                        .shadow_blur(10)
+                        .shadow_color("rgba(25, 100, 150, 0.5)")
+                        .shadow_offset_y(5)
+                        .color(Color::RadialGradient {
+                            x: 0.4,
+                            y: 0.3,
+                            r: 1.,
+                            color_stops: vec![
+                                ColorStop::new(0, "rgb(129, 227, 238)"),
+                                ColorStop::new(1, "rgb(25, 183, 207)"),
+                            ],
+                        }),
+                ),
+        )
+}