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 476629c05304a97b4eeb89bc27c708696161bfd5..c3bf35e010e6e53a2922cf2a13f81c765479246d --- 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 ee34c370b588c82d6073c918e73a440d0c80f553..e18c4db5c1ee5d6c403301cfc97c10f95dbc473d --- 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 :