From e741e4f1d9f5d7144552b7fa1d16bca5a13e6b45 Mon Sep 17 00:00:00 2001 From: Muhammad Hijazi Date: Sun, 25 Oct 2015 05:11:27 -0400 Subject: [PATCH 1/2] swapped names --- UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java b/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java index 19fe94f..f0ae1ca 100644 --- a/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java +++ b/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java @@ -74,11 +74,11 @@ public void trainNew(String filePath, String result){ e.printStackTrace(); } } - public void dispute(String filePath, String expectedResult, String actualResult){ + public void dispute(String filePath, String actualResult, String expectedResult){ try { // System.out.println(fileContent); // Runtime rt = Runtime.getRuntime(); - Process p = Runtime.getRuntime().exec("python " + commandPath + "/trainNew.py " + filePath + " " + expectedResult + " bad " + actualResult); + Process p = Runtime.getRuntime().exec("python " + commandPath + "/trainNew.py " + filePath + " " + actualResult + " bad " + expectedResult); BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream())); String line = null; while ((line = error.readLine()) != null) { From f85c9f629d55dc88c6a264aa294401169925269f Mon Sep 17 00:00:00 2001 From: Muhammad Hijazi Date: Sun, 25 Oct 2015 05:30:16 -0400 Subject: [PATCH 2/2] bug fixes --- UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java | 6 +++--- UGAHacksProject/src/main/resources/python/trainNew.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java b/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java index f0ae1ca..2f1dcdd 100644 --- a/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java +++ b/UGAHacksProject/src/main/java/gsu/ugahacksproject/tagg.java @@ -34,7 +34,7 @@ public String predict(String filePath){ BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream())); String line = null; while ((line = error.readLine()) != null) { - System.out.println("Python says: " + line); + System.out.println("Python error: " + line); } BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream())); @@ -67,7 +67,7 @@ public void trainNew(String filePath, String result){ BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream())); String line = null; while ((line = error.readLine()) != null) { - System.out.println("Python says: " + line); + System.out.println("Python error: " + line); } int exitVal = p.waitFor(); } catch (Exception e) { @@ -82,7 +82,7 @@ public void dispute(String filePath, String actualResult, String expectedResult) BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream())); String line = null; while ((line = error.readLine()) != null) { - System.out.println("Python says: " + line); + System.out.println("Python error: " + line); } int exitVal = p.waitFor(); } catch (Exception e) { diff --git a/UGAHacksProject/src/main/resources/python/trainNew.py b/UGAHacksProject/src/main/resources/python/trainNew.py index 59d140f..b6c5441 100644 --- a/UGAHacksProject/src/main/resources/python/trainNew.py +++ b/UGAHacksProject/src/main/resources/python/trainNew.py @@ -12,21 +12,21 @@ "Qu6z2uKlfDgqa7Atn1HlOBa3pakRBQHflQicLNr_", "8WgQ8D4Dp9IW1JilxEfjXjgg1geq1zpaeT3P7Rk3") -possibleStates["dent", "perfect"] +possibleStates=["dent", "perfect"] url = sys.argv[1] state = sys.argv[2].lower predictResult = sys.argv[3].lower() if predictResult == "good": clarifai_api.positive(url, state) - for s in states: + for s in possibleStates: if s != state: clarifai_api.negative(url, s) clarifai_api.train(state) if predictResult == "bad": expectedState = sys.argv[4].lower() clarifai_api.positive(url, expectedState) - for s in states: + for s in possibleStates: if s != expectedState: clarifai_api.negative(url, s) clarifai_api.train(expectedState)