From 201a9da4fef5f8a668776a7ec997ac2f0f11e868 Mon Sep 17 00:00:00 2001 From: Alexander_Kabui Date: Thu, 14 Jul 2022 13:18:28 +0300 Subject: add numoverlap to output --- src/correlations.rs | 6 +++--- src/sorter.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/correlations.rs b/src/correlations.rs index fcc8d29..88249c0 100644 --- a/src/correlations.rs +++ b/src/correlations.rs @@ -137,7 +137,7 @@ impl<'a> Compute<'a> { pub fn compute(&self) -> Vec<(String, f64, f64)> { //read from file); - let mut corr_results: Vec<(String, f64, f64)> = Vec::new(); + let mut corr_results: Vec<(String, f64, f64,i32)> = Vec::new(); let reader = BufferReader::new(self.dataset_path); @@ -185,14 +185,14 @@ impl<'a> Compute<'a> { let (rho, p_val) = Pearson::new(parsed_x_val.len()) .correlate(&parsed_x_val, &parsed_y_val); - corr_results.push((key_name, rho, p_val)); + corr_results.push((key_name, rho, p_val,parsed_x_val.len() as i32)); //writeln!(file, "{},{},{}",key_name,rho,p_val); } else { let (rho, p_val) = Spearman::new(parsed_x_val.len()) .correlate(&parsed_x_val, &parsed_y_val); - corr_results.push((key_name, rho, p_val)); + corr_results.push((key_name, rho, p_val,parsed_x_val.len() as i32)); //writeln!(file, "{},{},{}", key_name,rho,p_val); } diff --git a/src/sorter.rs b/src/sorter.rs index b5ed26c..d27b62b 100644 --- a/src/sorter.rs +++ b/src/sorter.rs @@ -9,7 +9,7 @@ const BUFFER_CAPACITY: usize = 4_000_000_000; //struct corr_results #[derive(Debug, PartialEq, PartialOrd)] -struct CorrResults(String, f64, f64); +struct CorrResults(String, f64, f64,i32); // impl Sortable for CorrResults { @@ -46,14 +46,14 @@ struct CorrResults(String, f64, f64); pub fn sort_write_to_file( filename: String, - mut v: Vec<(String, f64, f64)>, + mut v: Vec<(String, f64, f64,i32)>, ) -> std::io::Result { File::create(filename.clone())?; v.sort_by(|a, b| b.1.abs().partial_cmp(&a.1.abs()).unwrap()); let mut buffer = BufWriter::with_capacity(BUFFER_CAPACITY, File::create(&filename).unwrap()); - for (name, rho, p_val) in v.iter() { - writeln!(buffer, "{},{},{}", name, rho, p_val).unwrap(); + for (name, rho, p_val,num_overlap) in v.iter() { + writeln!(buffer, "{},{},{} {}", name, rho, p_val,num_overlap).unwrap(); } buffer.flush().unwrap(); -- cgit 1.4.1