From 877caf0213e8c8e515b944bfd39eb53a26002b88 Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 9 May 2022 16:57:13 +0300 Subject: filter key names from rows --- src/parser.rs | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) (limited to 'src/parser.rs') diff --git a/src/parser.rs b/src/parser.rs index f2dacc3..ee55418 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,6 +1,56 @@ + + + +#[derive(PartialEq, Debug)] +pub struct CorrelationEvaluateRow { + row_name:String, + x_vals: Vec, + y_vals: Vec +} + +impl CorrelationEvaluateRow { + fn new(row_name:&str,x_vals:Vec,y_vals:Vec) -> Self{ + Self { + row_name:String::from(row_name), + x_vals, + y_vals + } + } +} +pub fn parse_rows_with_names (x_vals:& [f64],y_vals:&[&str])->CorrelationEvaluateRow{ + + //initial stage + + //extract names + + + let string_floats = &y_vals[1..]; + + let row_name = match y_vals.get(0){ + Some(row_key) => String::from(*row_key), + None => String::from("") + }; + + + let results = parse_rows(x_vals,&string_floats); + + return CorrelationEvaluateRow { + row_name, + x_vals:results.0, + y_vals:results.1 + + }; + + + + + +} pub fn parse_rows (x_vals:&[f64],y_vals:&[&str]) -> (Vec,Vec){ - //pointer + //optimization ?? memory + + // assumes first item in row is the name of values i.e trait_1 , 12 , 12 , 12,14 let mut parsed_x_vals= Vec::new(); @@ -28,11 +78,15 @@ pub fn parse_rows (x_vals:&[f64],y_vals:&[&str]) -> (Vec,Vec){ (parsed_x_vals,parsed_y_vals) } - +pub fn file_path_validator(){ + todo!() +} #[cfg(test)] mod tests{ + + use super::*; #[test] @@ -53,5 +107,34 @@ mod tests{ assert_eq!(parse_rows(&x_vals, &string_with_nans),(vec![12.1,16.5],vec![1.2,11.1])); } + + + #[test] + fn test_extract_keys(){ + + //check on allocation + + + let x_vals = [12.2,12.1,16.5,11.1,11.6]; + + + let expected_results = [ + CorrelationEvaluateRow::new("trait_1",vec![12.1, 16.5, 11.6],vec![1.2,11.1,4.5]), + CorrelationEvaluateRow::new("trait_2",vec![12.1, 16.5, 11.6],vec![1.6,11.5,4.2]), + CorrelationEvaluateRow::new("trait_3",vec![12.2, 12.1, 16.5, 11.6],vec![6.5,1.6,11.5,4.2]), + CorrelationEvaluateRow::new("trait_4", vec![12.2, 12.1, 16.5, 11.6],vec![12.5, 1.6, 11.5, 4.2]) + ]; + + for (index,test_case) in [ + ["trait_1","","1.2","11.1","","4.5","nan"], + ["trait_2","","1.6","11.5","","4.2","nan"], + ["trait_3","6.5","1.6","11.5","","4.2","12.1"], + ["trait_4","12.5","1.6","11.5","","4.2","1.1"] + ].iter().enumerate(){ + + assert_eq!(parse_rows_with_names(&x_vals, &*test_case),expected_results[index]) + + } + } } -- cgit 1.4.1