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

Added dz! macro into dataframe #98

Closed
wants to merge 1 commit into from
Closed
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
66 changes: 66 additions & 0 deletions charming/src/datatype/dataframe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,70 @@
),*
]
};
}

Check warning on line 71 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

Check warning on line 71 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

/// Code below is modified 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"];

Check warning on line 84 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

Check warning on line 84 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs
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![

Check warning on line 94 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

Check warning on line 94 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs
$(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);
}

Check warning on line 109 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

Check warning on line 109 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs
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)),

Check warning on line 116 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs

Check warning on line 116 in charming/src/datatype/dataframe.rs

View workflow job for this annotation

GitHub Actions / Linting and formatting

Diff in /home/runner/work/charming/charming/charming/src/datatype/dataframe.rs
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
}};
}
Loading