From 40c4f983da7482112703700f861cd8671329db9b Mon Sep 17 00:00:00 2001 From: Tristan Crockett Date: Tue, 19 Feb 2019 18:03:33 -0600 Subject: [PATCH] Postmodel fixes (#604) - Add postmodel requirements to requirement/main [Resolves #602] - Change matrixstore references in postmodel.model_evaluator [Resolves #603] --- requirement/main.txt | 3 +++ src/triage/component/postmodeling/contrast/model_evaluator.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/requirement/main.txt b/requirement/main.txt index 0a3ded348..af2dbb9c9 100644 --- a/requirement/main.txt +++ b/requirement/main.txt @@ -21,3 +21,6 @@ wrapt==1.11.1 argcmdr==0.6.0 sqlparse==0.2.4 pebble==4.3.9 +seaborn==0.9.0 +adjustText==0.7.3 +graphviz==0.10.1 diff --git a/src/triage/component/postmodeling/contrast/model_evaluator.py b/src/triage/component/postmodeling/contrast/model_evaluator.py index 3438f87c4..6252a19e9 100644 --- a/src/triage/component/postmodeling/contrast/model_evaluator.py +++ b/src/triage/component/postmodeling/contrast/model_evaluator.py @@ -302,7 +302,7 @@ def preds_matrix(self, path): storage = ProjectStorage(path) matrix_storage = MatrixStorageEngine(storage).get_store(self.pred_matrix_uuid) - mat = matrix_storage.matrix + mat = matrix_storage.design_matrix # Merge with predictions table and return complete matrix merged_df = pd.merge(mat, @@ -336,7 +336,7 @@ def train_matrix(self, path): storage = ProjectStorage(path) matrix_storage = MatrixStorageEngine(storage).get_store(self.train_matrix_uuid) - mat = matrix_storage.matrix + mat = matrix_storage.design_matrix # Merge with predictions table and return complete matrix merged_df = mat.merge(self.predictions,