about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/correlations.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/correlations.rs b/src/correlations.rs
index e2a35a2..74ab26e 100644
--- a/src/correlations.rs
+++ b/src/correlations.rs
@@ -202,18 +202,13 @@ impl<'a> Compute<'a> {
 
         //naive implementation try extern sorting could save 3 seconds
 
-<<<<<<< HEAD
+
         corr_results.sort_by(|a, b| b.1.abs().partial_cmp(&a.1.abs()).unwrap());
-=======
 
        // corr_results.sort_by(|a,b|b.1.abs().partial_cmp(&a.1.abs()).unwrap());
        sort_write_to_file(String::from("sorted_results.txt"), corr_results).unwrap();
        
->>>>>>> fa2af92aff04d2b6c9ac6e8d4f7d5e1f150b4070
-
         return vec![]
-
-        //things todo retention sort //
     }
 }
 #[derive(PartialEq, Debug)]