From 2dadf8d459a8b57450343e286eeba44f47ff8d74 Mon Sep 17 00:00:00 2001 From: GabrielKS <23368820+GabrielKS@users.noreply.github.com> Date: Thu, 22 Jul 2021 21:37:44 -0600 Subject: [PATCH] Fix accidental ensemble change, fix AlgorithmTypes bug + In a previous commit, I accidentally changed the selected ensemble; here, I change it back + AlgorithmTypes was misnumbered -- both PLACEHOLDER_2 and PLACEHOLDER_3 had values of 3 -- here, I fix that --- .../analysis/classification/inference/labels/pipeline.py | 2 +- emission/core/wrapper/labelprediction.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emission/analysis/classification/inference/labels/pipeline.py b/emission/analysis/classification/inference/labels/pipeline.py index e006599d4..ea9f3e138 100644 --- a/emission/analysis/classification/inference/labels/pipeline.py +++ b/emission/analysis/classification/inference/labels/pipeline.py @@ -23,7 +23,7 @@ # ensemble specifies which algorithm in eacile to run. # This makes it easy to test various ways of combining various algorithms. -ensemble = eacile.ensemble_first_prediction +ensemble = eacile.ensemble_real_and_placeholder # Does all the work necessary for a given user diff --git a/emission/core/wrapper/labelprediction.py b/emission/core/wrapper/labelprediction.py index a9b009f33..841969567 100644 --- a/emission/core/wrapper/labelprediction.py +++ b/emission/core/wrapper/labelprediction.py @@ -15,9 +15,9 @@ class AlgorithmTypes(enum.Enum): PLACEHOLDER_0 = 1 PLACEHOLDER_1 = 2 PLACEHOLDER_2 = 3 - PLACEHOLDER_3 = 3 - TWO_STAGE_BIN_CLUSTER = 4 - PLACEHOLDER_PREDICTOR_DEMO = 5 + PLACEHOLDER_3 = 4 + TWO_STAGE_BIN_CLUSTER = 5 + PLACEHOLDER_PREDICTOR_DEMO = 6 class Labelprediction(ecwb.WrapperBase):