From 2e9e648e706cd790bb6303d0566c4861f7a885ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Tj=C3=B6rnhammar?= <richard.tjornhammar@gmail.com>
Date: Wed, 4 Mar 2020 11:45:20 +0100
Subject: [PATCH] v0.16

---
 LICENSE                         | 0
 Makefile                        | 0
 README.md                       | 0
 requirements.txt                | 0
 setup.py                        | 2 +-
 src/impetuous/__init__.py       | 0
 src/impetuous/clustering.py     | 0
 src/impetuous/convert.py        | 0
 src/impetuous/hierarchal.py     | 0
 src/impetuous/impetuous.py      | 0
 src/impetuous/pathways.py       | 0
 src/impetuous/quantification.py | 2 ++
 12 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 requirements.txt
 mode change 100644 => 100755 setup.py
 mode change 100644 => 100755 src/impetuous/__init__.py
 mode change 100644 => 100755 src/impetuous/clustering.py
 mode change 100644 => 100755 src/impetuous/convert.py
 mode change 100644 => 100755 src/impetuous/hierarchal.py
 mode change 100644 => 100755 src/impetuous/impetuous.py
 mode change 100644 => 100755 src/impetuous/pathways.py
 mode change 100644 => 100755 src/impetuous/quantification.py

diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 476629c..c3bf35e
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name = "impetuous-gfa",
-    version = "0.15.0",
+    version = "0.16.0",
     author = "Richard Tjörnhammar",
     author_email = "richard.tjornhammar@gmail.com",
     description = "Impetuous Quantification, Enrichment and Group Variation Analysis",
diff --git a/src/impetuous/__init__.py b/src/impetuous/__init__.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/clustering.py b/src/impetuous/clustering.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/convert.py b/src/impetuous/convert.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/hierarchal.py b/src/impetuous/hierarchal.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/impetuous.py b/src/impetuous/impetuous.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/pathways.py b/src/impetuous/pathways.py
old mode 100644
new mode 100755
diff --git a/src/impetuous/quantification.py b/src/impetuous/quantification.py
old mode 100644
new mode 100755
index ee34c37..e18c4db
--- a/src/impetuous/quantification.py
+++ b/src/impetuous/quantification.py
@@ -126,6 +126,8 @@ def run_rpls_regression ( analyte_df , journal_df , formula ,
             journal_df.loc[ ':'.join(pair) ] = [ p[0]+'-'+p[1] for p in journal_df.loc[ pair,: ].T.values ]
             add_pairs.append(':'.join(pair))
     use_categories = list(set(find_category_variables(formula.split('~')[1])))
+    use_categories =  [u for u in use_categories if 'C('+u+')' in set(formula.replace(' ','').split('~')[1].split('+'))]
+    #
     use_categories = [ *use_categories,*add_pairs ]
     #
     if len( use_categories )>0 :
-- 
GitLab