From 6f00abb341bb608aac7adda0ce82c2430db206f0 Mon Sep 17 00:00:00 2001 From: Lukas Heumos Date: Mon, 31 May 2021 10:48:35 +0200 Subject: [PATCH 1/3] pin sparse to 0.9.1 fixes #194 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 33750e6..3ea27ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,4 @@ sphinx-autodoc-typehints sphinx_rtd_theme jinja2 docutils - +sparse==0.9.1 From b2ebeb0fb7c6c215d51264cd258edf9d013ff021 Mon Sep 17 00:00:00 2001 From: Shaun Adkins Date: Mon, 26 Jul 2021 14:20:01 -0400 Subject: [PATCH 2/3] Change to allow grouping order to be preserved --- diffxpy/testing/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diffxpy/testing/utils.py b/diffxpy/testing/utils.py index 6763a23..1852b99 100644 --- a/diffxpy/testing/utils.py +++ b/diffxpy/testing/utils.py @@ -111,7 +111,8 @@ def parse_grouping(data, sample_description, grouping): def split_x(data, grouping): grouping = np.asarray(grouping) - groups = np.unique(grouping) + #groups = np.unique(grouping) + groups = pd.Series(grouping).unique() x0 = data[np.where(grouping == groups[0])[0]] x1 = data[np.where(grouping == groups[1])[0]] return x0, x1 From 0464d2ab1faa0947d90e29f93018ec678e050585 Mon Sep 17 00:00:00 2001 From: Shaun Adkins Date: Wed, 24 Nov 2021 09:37:06 -0500 Subject: [PATCH 3/3] Removing comment --- diffxpy/testing/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/diffxpy/testing/utils.py b/diffxpy/testing/utils.py index 1852b99..369d399 100644 --- a/diffxpy/testing/utils.py +++ b/diffxpy/testing/utils.py @@ -111,7 +111,6 @@ def parse_grouping(data, sample_description, grouping): def split_x(data, grouping): grouping = np.asarray(grouping) - #groups = np.unique(grouping) groups = pd.Series(grouping).unique() x0 = data[np.where(grouping == groups[0])[0]] x1 = data[np.where(grouping == groups[1])[0]]