From fa2e01c495b0223ff4131c9aff98f24796b13477 Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 12:53:35 -0500 Subject: [PATCH 1/8] Update FeatureMapFileWriter.java Added writeVectors to output a file of pure feature vectors. --- .../java/edu/auburn/extraction/FeatureMapFileWriter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java index 9ccaf5e..9785433 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java @@ -20,6 +20,11 @@ public void write(String url, FeatureMap featureMap) throws IOExcepti getFileWriter().write("\n"); } + public void writeVectors(String url, FeatureMap featureMap) throws IOException { + getFileWriter().write(featureMap.toString()); + getFileWriter().write("\n"); + } + public void close() throws IOException { getFileWriter().flush(); getFileWriter().close(); From bed016946a9198581b6c34e5f1c951d0a6d47a8e Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 12:57:38 -0500 Subject: [PATCH 2/8] Update FeatureMap.java --- .../main/java/edu/auburn/extraction/FeatureMap.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java index 9cc3364..df655de 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java @@ -69,4 +69,14 @@ public String toString() { return mapStringBuilder.toString(); } + + ++ public String toStringVector() { ++ StringBuilder mapStringBuilder = new StringBuilder(); ++ for (T feature : getFeatures()) { ++ Integer featureCount = featureDistribution.get(feature); ++ double featureFraction = ((double) featureCount) / getTotalFeatureCount(); ++ mapStringBuilder.append(String.format("%f ", featureFraction)); ++ } ++ return mapStringBuilder.toString(); ++} } From 0f00870e83fc10015650286fcfc6ad06524cf737 Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:25:08 -0500 Subject: [PATCH 3/8] Update FeatureMapFileWriter.java --- .../main/java/edu/auburn/extraction/FeatureMapFileWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java index 9785433..8753343 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java @@ -21,7 +21,7 @@ public void write(String url, FeatureMap featureMap) throws IOExcepti } public void writeVectors(String url, FeatureMap featureMap) throws IOException { - getFileWriter().write(featureMap.toString()); + getFileWriter().write(featureMap.toStringVector()); getFileWriter().write("\n"); } From c99533207f486e9f4e52f31a235f975ce22d11d7 Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:27:58 -0500 Subject: [PATCH 4/8] Update FeatureMap.java --- .../src/main/java/edu/auburn/extraction/FeatureMap.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java index df655de..404b96b 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java @@ -72,7 +72,10 @@ public String toString() { + + public String toStringVector() { + StringBuilder mapStringBuilder = new StringBuilder(); -+ for (T feature : getFeatures()) { + int count = 0; + mapStringBuilder.append("%d ", count); + count ++; ++ for (T feature : getFeatures()) { + Integer featureCount = featureDistribution.get(feature); + double featureFraction = ((double) featureCount) / getTotalFeatureCount(); + mapStringBuilder.append(String.format("%f ", featureFraction)); From d4dd545ca2348dadc337b9db0da87c56531509e9 Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:28:28 -0500 Subject: [PATCH 5/8] Update FeatureMap.java --- .../src/main/java/edu/auburn/extraction/FeatureMap.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java index 404b96b..e40fc5c 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java @@ -72,9 +72,6 @@ public String toString() { + + public String toStringVector() { + StringBuilder mapStringBuilder = new StringBuilder(); - int count = 0; - mapStringBuilder.append("%d ", count); - count ++; + for (T feature : getFeatures()) { + Integer featureCount = featureDistribution.get(feature); + double featureFraction = ((double) featureCount) / getTotalFeatureCount(); From f31cba28645517912e3957982e01bc1c349b0be1 Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:30:06 -0500 Subject: [PATCH 6/8] Update FeatureMapFileWriter.java --- .../main/java/edu/auburn/extraction/FeatureMapFileWriter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java index 8753343..098b777 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java @@ -21,6 +21,7 @@ public void write(String url, FeatureMap featureMap) throws IOExcepti } public void writeVectors(String url, FeatureMap featureMap) throws IOException { + getFileWriter().write("0 "); //Dummy Value for TrainingSet's count getFileWriter().write(featureMap.toStringVector()); getFileWriter().write("\n"); } From 94a02975d05a17b095de2dd755c79673045e38bd Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:51:01 -0500 Subject: [PATCH 7/8] Update FeatureMapFileWriter.java --- .../main/java/edu/auburn/extraction/FeatureMapFileWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java index 098b777..fa3f625 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMapFileWriter.java @@ -21,7 +21,7 @@ public void write(String url, FeatureMap featureMap) throws IOExcepti } public void writeVectors(String url, FeatureMap featureMap) throws IOException { - getFileWriter().write("0 "); //Dummy Value for TrainingSet's count + getFileWriter().write("0 0 "); //Dummy Value for TrainingSet's count getFileWriter().write(featureMap.toStringVector()); getFileWriter().write("\n"); } From 9be2c79eadad633bfb79a5a2f7efe8262238e56d Mon Sep 17 00:00:00 2001 From: rLegacy <31908488+rLegacy@users.noreply.github.com> Date: Tue, 31 Oct 2017 19:04:10 -0500 Subject: [PATCH 8/8] Update FeatureMap.java --- .../edu/auburn/extraction/FeatureMap.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java index e40fc5c..be88b1e 100644 --- a/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java +++ b/assignment1/src/main/java/edu/auburn/extraction/FeatureMap.java @@ -69,14 +69,14 @@ public String toString() { return mapStringBuilder.toString(); } - + -+ public String toStringVector() { -+ StringBuilder mapStringBuilder = new StringBuilder(); -+ for (T feature : getFeatures()) { -+ Integer featureCount = featureDistribution.get(feature); -+ double featureFraction = ((double) featureCount) / getTotalFeatureCount(); -+ mapStringBuilder.append(String.format("%f ", featureFraction)); -+ } -+ return mapStringBuilder.toString(); -+} + + public String toStringVector() { + StringBuilder mapStringBuilder = new StringBuilder(); + for (T feature : getFeatures()) { + Integer featureCount = featureDistribution.get(feature); + double featureFraction = ((double) featureCount) / getTotalFeatureCount(); + mapStringBuilder.append(String.format("%f ", featureFraction)); + } + return mapStringBuilder.toString(); +} }