From 8bc6755574a2c2dba38179e647f0c7d55ea93bbd Mon Sep 17 00:00:00 2001 From: Genaro Camele Date: Fri, 20 Oct 2023 14:02:12 -0300 Subject: [PATCH] Fixed Clippy warnings --- src/adjustment.rs | 4 ++-- src/analysis.rs | 6 +++--- src/lib.rs | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/adjustment.rs b/src/adjustment.rs index a4e194c..697b643 100644 --- a/src/adjustment.rs +++ b/src/adjustment.rs @@ -37,7 +37,7 @@ impl BenjaminiHochberg { impl Adjustment for BenjaminiHochberg { fn adjust(&mut self, p_value: f64, rank: usize) -> f64 { let valid_rank = self.total_number_of_elements - rank as f64; - let q_value = p_value * (self.total_number_of_elements / valid_rank as f64); + let q_value = p_value * (self.total_number_of_elements / valid_rank); let q_value = q_value.min(self.previous_max_p_value).min(1.0); self.previous_max_p_value = q_value; q_value @@ -67,7 +67,7 @@ impl Adjustment for BenjaminiYekutieli { fn adjust(&mut self, p_value: f64, rank: usize) -> f64 { let valid_rank = self.total_number_of_elements - rank as f64; let adjustment_factor = - self.accumulator * self.total_number_of_elements / valid_rank as f64; + self.accumulator * self.total_number_of_elements / valid_rank; let q_value = p_value * adjustment_factor; let q_value = q_value.min(self.previous_max_p_value).min(1.0); self.previous_max_p_value = q_value; diff --git a/src/analysis.rs b/src/analysis.rs index 3dde039..69e319b 100644 --- a/src/analysis.rs +++ b/src/analysis.rs @@ -142,7 +142,7 @@ impl Analysis { where J::IntoIter: Clone, { - i.cartesian_product(j.into_iter()) + i.cartesian_product(j) } fn run_analysis( @@ -201,7 +201,7 @@ impl Analysis { _ => { // Benjamini-Hochberg and Benjamini-Yekutieli needs sort by p-value (descending order) to // make the adjustment - let sorter = ExternalSorter::new().with_segment_size(self.sort_buf_size as usize); + let sorter = ExternalSorter::new().with_segment_size(self.sort_buf_size); Box::new(sorter.sort_by(filtered, |result_1, result_2| { result_2 .p_value @@ -245,7 +245,7 @@ impl Analysis { // Sorts by correlation in descending order let sorter = - ExternalSorter::new().with_segment_size(self.sort_buf_size as usize); + ExternalSorter::new().with_segment_size(self.sort_buf_size); let sorted_cor_desc = sorter.sort_by(filtered, |combination_1, combination_2| { // Unwrap is safe as correlation values are all valid in this stage of algorithm (None diff --git a/src/lib.rs b/src/lib.rs index 052c002..ff9f753 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -132,7 +132,8 @@ create_exception!(ggca, InvalidAdjustmentMethod, pyo3::exceptions::PyException); // NOTE: Python has named arguments, so this linting warning can be disabled without sacrificing maintainability #[pyfunction] -#[allow(clippy::too_many_arguments)] fn correlate( +#[allow(clippy::too_many_arguments)] +fn correlate( py: Python, gene_file_path: String, gem_file_path: String,