diff --git a/mutation_origin/__pycache__/__init__.cpython-38.pyc b/mutation_origin/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..2be3efa Binary files /dev/null and b/mutation_origin/__pycache__/__init__.cpython-38.pyc differ diff --git a/mutation_origin/__pycache__/encoder.cpython-38.pyc b/mutation_origin/__pycache__/encoder.cpython-38.pyc new file mode 100644 index 0000000..07d75ba Binary files /dev/null and b/mutation_origin/__pycache__/encoder.cpython-38.pyc differ diff --git a/mutation_origin/__pycache__/feature.cpython-38.pyc b/mutation_origin/__pycache__/feature.cpython-38.pyc new file mode 100644 index 0000000..9f97ea7 Binary files /dev/null and b/mutation_origin/__pycache__/feature.cpython-38.pyc differ diff --git a/mutation_origin/__pycache__/util.cpython-38.pyc b/mutation_origin/__pycache__/util.cpython-38.pyc new file mode 100644 index 0000000..8c86398 Binary files /dev/null and b/mutation_origin/__pycache__/util.cpython-38.pyc differ diff --git a/mutation_origin/batch.py b/mutation_origin/batch.py index 5f455d6..fab97db 100644 --- a/mutation_origin/batch.py +++ b/mutation_origin/batch.py @@ -10,7 +10,7 @@ import click import pandas from tqdm import tqdm -from cogent3 import LoadTable +from cogent3 import make_table from cogent3.util import parallel from mutation_origin.cli import (sample_data as mutori_sample, lr_train as mutori_lr_train, @@ -556,7 +556,7 @@ def collate(base_path, output_path, exclude_paths, overwrite): columns = sorted(keys) rows = list(map(lambda r: [r.get(c, None) for c in columns], records)) - table = LoadTable(header=columns, rows=rows) + table = make_table(header=columns, data=rows) table = table.sorted(reverse="auc") table = table.with_new_column("name", lambda x: model_name_from_features(*x), diff --git a/mutation_origin/util.py b/mutation_origin/util.py index 4773930..e848966 100644 --- a/mutation_origin/util.py +++ b/mutation_origin/util.py @@ -8,7 +8,7 @@ import numpy from tqdm import tqdm from cogent3.util.misc import open_, get_format_suffixes -from cogent3 import LoadTable +from cogent3 import make_table __author__ = 'Gavin Huttley' @@ -241,7 +241,7 @@ def summary_stat_table(table, factors): for col in fscore_cols: header.extend([f'mean_{col}', f'std_{col}']) - table = LoadTable(header=header, rows=rows) + table = make_table(header=header, data=rows) table = table.sorted(reverse='mean_auc') return table