From 7dfebf00a11780e29d3b26b36ec52a26ae2a4322 Mon Sep 17 00:00:00 2001
From: jortiz16 <jortiz16@uw.edu>
Date: Fri, 16 Dec 2016 01:05:20 -0800
Subject: [PATCH] bug fixes

---
 perfenforce_files/filesToFetch.txt                           | 2 +-
 .../washington/escience/myria/api/PerfEnforceResource.java   | 4 ++--
 .../myria/api/encoding/PerfEnforceQueryMetadataEncoding.java | 1 +
 .../escience/myria/perfenforce/PSLAManagerWrapper.java       | 4 ++--
 .../escience/myria/perfenforce/PerfEnforceDriver.java        | 4 +++-
 .../myria/perfenforce/PerfEnforceOnlineLearning.java         | 5 +----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/perfenforce_files/filesToFetch.txt b/perfenforce_files/filesToFetch.txt
index 0b04a2108..cc9e8513e 100644
--- a/perfenforce_files/filesToFetch.txt
+++ b/perfenforce_files/filesToFetch.txt
@@ -10,7 +10,7 @@ PSLAGeneration/weka.jar
 PSLAGeneration/tiers.txt
 PSLAGeneration/training.arff
 PerfEnforceScaling/moa.jar
-PerfEnforceScaling/training.jar
+PerfEnforceScaling/training.arff
 PerfEnforceScaling/features/4
 PerfEnforceScaling/features/6
 PerfEnforceScaling/features/8
diff --git a/src/edu/washington/escience/myria/api/PerfEnforceResource.java b/src/edu/washington/escience/myria/api/PerfEnforceResource.java
index 12c324c26..c6167942d 100644
--- a/src/edu/washington/escience/myria/api/PerfEnforceResource.java
+++ b/src/edu/washington/escience/myria/api/PerfEnforceResource.java
@@ -41,8 +41,8 @@ public Response prepareData(final List<PerfEnforceTableEncoding> tableList)
 
   @GET
   @Path("/getDataPreparationStatus")
-  public String getDataPreparationStatus() {
-    return server.getPerfEnforceDriver().getDataPreparationStatus();
+  public Response getDataPreparationStatus() {
+    return Response.ok(server.getPerfEnforceDriver().getDataPreparationStatus()).build();
   }
 
   @GET
diff --git a/src/edu/washington/escience/myria/api/encoding/PerfEnforceQueryMetadataEncoding.java b/src/edu/washington/escience/myria/api/encoding/PerfEnforceQueryMetadataEncoding.java
index 2b278e861..cbaa424e4 100644
--- a/src/edu/washington/escience/myria/api/encoding/PerfEnforceQueryMetadataEncoding.java
+++ b/src/edu/washington/escience/myria/api/encoding/PerfEnforceQueryMetadataEncoding.java
@@ -18,6 +18,7 @@ public PerfEnforceQueryMetadataEncoding(
 
     this.id = id;
     this.slaRuntime = slaRuntime;
+    this.queryText = queryText;
   }
 
   public double getSLA() {
diff --git a/src/edu/washington/escience/myria/perfenforce/PSLAManagerWrapper.java b/src/edu/washington/escience/myria/perfenforce/PSLAManagerWrapper.java
index ffc8b1b0b..26ba0cf92 100644
--- a/src/edu/washington/escience/myria/perfenforce/PSLAManagerWrapper.java
+++ b/src/edu/washington/escience/myria/perfenforce/PSLAManagerWrapper.java
@@ -31,7 +31,7 @@ public void generateQueries() throws Exception {
                   "mono "
                       + PSLAManagerExePath.toString()
                       + " -f "
-                      + PerfEnforceDriver.configurationPath.toString()
+                      + PerfEnforceDriver.configurationPath.resolve("PSLAGeneration").toString()
                       + " -q");
 
       System.out.println(IOUtils.toString(p.getErrorStream()));
@@ -50,7 +50,7 @@ public void generatePSLA() throws Exception {
                   "mono "
                       + PSLAManagerExePath.toString()
                       + " -f "
-                      + PerfEnforceDriver.configurationPath.toString()
+                      + PerfEnforceDriver.configurationPath.resolve("PSLAGeneration").toString()
                       + " -p");
 
       p.waitFor();
diff --git a/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java b/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java
index afb110815..7b6ae9ec2 100644
--- a/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java
+++ b/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java
@@ -79,6 +79,7 @@ public void fetchS3Files() throws PerfEnforceException, Exception {
   }
 
   public void preparePSLA(List<PerfEnforceTableEncoding> tableList) throws Exception {
+    isDonePSLA = false;
     PerfEnforceDriver.tableList = tableList;
     fetchS3Files();
 
@@ -114,8 +115,9 @@ public void preparePSLA(List<PerfEnforceTableEncoding> tableList) throws Excepti
     PSLAManagerWrapper pslaManager = new PSLAManagerWrapper();
     pslaManager.generateQueries();
     perfenforceDataPrepare.collectFeaturesFromGeneratedQueries();
-
     pslaManager.generatePSLA();
+
+    dataPreparationStatus = "Finished";
     isDonePSLA = true;
   }
 
diff --git a/src/edu/washington/escience/myria/perfenforce/PerfEnforceOnlineLearning.java b/src/edu/washington/escience/myria/perfenforce/PerfEnforceOnlineLearning.java
index 939c960a7..d1c87690a 100644
--- a/src/edu/washington/escience/myria/perfenforce/PerfEnforceOnlineLearning.java
+++ b/src/edu/washington/escience/myria/perfenforce/PerfEnforceOnlineLearning.java
@@ -138,13 +138,10 @@ public void findBestClusterSize() throws PerfEnforceException {
             PerfEnforceUtils.getMaxFeature(
                 server, currentQueryForConfiguration, currentClusterSize);
 
-        String maxFeatureForConfiguration =
-            PerfEnforceUtils.getMaxFeature(server, currentQueryFeatures, c);
-
         FileWriter featureWriterForConfiguration;
         featureWriterForConfiguration =
             new FileWriter(Paths.get(onlineLearningPath, "features", String.valueOf(c)).toString());
-        featureWriterForConfiguration.write(maxFeatureForConfiguration + '\n');
+        featureWriterForConfiguration.write(currentQueryFeatures + '\n');
         featureWriterForConfiguration.close();
       }
     } catch (Exception e) {