From 7f5a6dc69b98696d5d3b84c207f75600081dabd6 Mon Sep 17 00:00:00 2001 From: Joachim Wolff Date: Fri, 25 May 2018 19:22:29 +0200 Subject: [PATCH] Changing pca test case to check only absolute values. Increase version number to 2.1.4 --- hicexplorer/_version.py | 2 +- hicexplorer/test/test_hicPCA.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hicexplorer/_version.py b/hicexplorer/_version.py index bd56a998..be875f6c 100644 --- a/hicexplorer/_version.py +++ b/hicexplorer/_version.py @@ -2,4 +2,4 @@ # This file is originally generated from Git information by running 'setup.py # version'. Distribution tarballs contain a pre-generated copy of this file. -__version__ = '2.1.3' +__version__ = '2.1.4' diff --git a/hicexplorer/test/test_hicPCA.py b/hicexplorer/test/test_hicPCA.py index 0dad97ad..cdfe9ebb 100644 --- a/hicexplorer/test/test_hicPCA.py +++ b/hicexplorer/test/test_hicPCA.py @@ -22,7 +22,7 @@ def are_files_equal(file1, file2): split_x = x.split('\t') split_y = y.split('\t') if split_x[0] == split_y[0] and split_x[1] == split_y[1] and split_x[2] == split_y[2]: - if float(split_x[3]) == float(split_y[3]) * -1: + if abs(float(split_x[3])) == abs(float(split_y[3])): continue equal = False break @@ -47,9 +47,8 @@ def are_files_equal_bigwig(file1, file2): # sometimes the values are + / - flipped if bins_list_file1 is not None and bins_list_file1[0][2] != bins_list_file2[0][2]: - bins_list_file1 = np.array(bins_list_file1) - bins_list_file2 = np.array(bins_list_file2) - bins_list_file1[:][2] *= -1 + bins_list_file1 = np.absolute(np.array(bins_list_file1)) + bins_list_file2 = np.absolute(np.array(bins_list_file2)) if bins_list_file1 is None and bins_list_file2 is None: return True nt.assert_array_almost_equal(bins_list_file1, bins_list_file2)