From beb78210acad590b3dac1753961acc6fc23d5a8e Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Tue, 2 Apr 2019 15:39:28 -0400
Subject: [PATCH] Time accuracy
---
.../MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py | 3 ++-
.../MonoviewClassifiers/AdaboostPregenTree.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py b/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py
index becea218..aca484e1 100644
--- a/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py
+++ b/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py
@@ -75,13 +75,14 @@ class ColumnGenerationClassifierQar(BaseEstimator, ClassifierMixin, BaseBoost):
def fit(self, X, y):
- start = time.time()
+
formatted_X, formatted_y = self.format_X_y(X, y)
self.init_info_containers()
m, n, y_kernel_matrix = self.init_hypotheses(formatted_X, formatted_y)
+ start = time.time()
self.n_total_hypotheses_ = n
self.n_total_examples = m
diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregenTree.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregenTree.py
index 6f5aaf49..2d52f3e9 100644
--- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregenTree.py
+++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregenTree.py
@@ -39,8 +39,8 @@ class AdaboostPregenTree(AdaBoostClassifier, BaseMonoviewClassifier, PregenClass
self.random_state = random_state
def fit(self, X, y, sample_weight=None):
- begin = time.time()
pregen_X, pregen_y = self.pregen_voters(X, y, generator=self.estimators_generator)
+ begin = time.time()
super(AdaboostPregenTree, self).fit(pregen_X, pregen_y, sample_weight=sample_weight)
end = time.time()
self.train_time = end-begin
--
GitLab