diff --git a/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py b/multiview_platform/MonoMultiViewClassifiers/Monoview/Additions/CGDescUtils.py index becea21844e51906de7dba2915c35cfbfc898135..aca484e1480da2132ff3fabd458f8818475d63fb 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 6f5aaf497956fa831fc044d3ea825882e955e4b4..2d52f3e9b87481be0dcbf96edb0402b1c06c075a 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