From 5ad0e8c44e4d98ef0ccd7fd2b572021f26461b3c Mon Sep 17 00:00:00 2001
From: Dongsheng Yang <dongshen@ottertune.pdl.cmu.edu>
Date: Thu, 26 Sep 2019 21:50:04 -0400
Subject: [PATCH] delete unused algorithm 3

---
 .../migrations/0006_added_algorithm_selection.py  |  4 +++-
 server/website/website/types.py                   | 10 ++++------
 server/website/website/utils.py                   | 15 ---------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/server/website/website/migrations/0006_added_algorithm_selection.py b/server/website/website/migrations/0006_added_algorithm_selection.py
index e73d688..1514e18 100644
--- a/server/website/website/migrations/0006_added_algorithm_selection.py
+++ b/server/website/website/migrations/0006_added_algorithm_selection.py
@@ -16,7 +16,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='session',
             name='algorithm',
-            field=models.IntegerField(choices=[(1, 'Ottertune Default'), (2, 'Algorithm 1'), (3, 'Algorithm 2'), (4, 'Algorithm 3')], default=1),
+            field=models.IntegerField(choices=[(1, 'Ottertune Default'),
+                                               (2, 'Deep Deterministic Policy Gradients'),
+                                               (3, 'Deep Neural Network')], default=1),
         ),
         migrations.AlterField(
             model_name='pipelinedata',
diff --git a/server/website/website/types.py b/server/website/website/types.py
index 14af454..b6c4912 100644
--- a/server/website/website/types.py
+++ b/server/website/website/types.py
@@ -174,13 +174,11 @@ class LabelStyleType(BaseType):
 
 class AlgorithmType(BaseType):
     OTTERTUNE = 1
-    ALGORITHM1 = 2
-    ALGORITHM2 = 3
-    ALGORITHM3 = 4
+    DDPG = 2
+    DNN = 3
 
     TYPE_NAMES = {
         OTTERTUNE: 'Ottertune Default',
-        ALGORITHM1: 'Algorithm 1',
-        ALGORITHM2: 'Algorithm 2',
-        ALGORITHM3: 'Algorithm 3'
+        DDPG: 'Deep Deterministic Policy Gradients',
+        DNN: 'Deep Neural Network',
     }
diff --git a/server/website/website/utils.py b/server/website/website/utils.py
index 2b31be4..3b37637 100644
--- a/server/website/website/utils.py
+++ b/server/website/website/utils.py
@@ -110,21 +110,6 @@ class DataUtil(object):
             maxvals.append(maxval)
         return np.array(minvals), np.array(maxvals)
 
-    @staticmethod
-    def denormalize_knob_data(knob_values, knob_labels, session):
-        for i, knob in enumerate(knob_labels):
-            knob_object = KnobCatalog.objects.get(dbms=session.dbms, name=knob, tunable=True)
-            knob_session_object = SessionKnob.objects.filter(knob=knob_object, session=session,
-                                                             tunable=True)
-            if knob_session_object.exists():
-                minval = float(knob_session_object[0].minval)
-                maxval = float(knob_session_object[0].maxval)
-            else:
-                minval = float(knob_object.minval)
-                maxval = float(knob_object.maxval)
-            knob_values[i] = knob_values[i] * (maxval - minval) + minval
-        return knob_values
-
     @staticmethod
     def aggregate_data(results):
         knob_labels = list(JSONUtil.loads(results[0].knob_data.data).keys())