extract ResultMap and MvResultMap from Aggregations Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/34230cfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/34230cfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/34230cfb
Branch: refs/heads/master Commit: 34230cfbe0184e4c9b00aa9621e1a4a91f706790 Parents: 3dd0dc7 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Fri Apr 21 09:37:20 2017 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Fri Apr 21 09:37:20 2017 -0400 ---------------------------------------------------------------------- .../edgent/analytics/math3/Aggregations.java | 30 +------------------- .../edgent/analytics/math3/MvResultMap.java | 12 ++++++++ .../edgent/analytics/math3/ResultMap.java | 10 +++++++ .../test/analytics/math3/Statistics2Test.java | 14 ++++----- 4 files changed, 30 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34230cfb/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/Aggregations.java ---------------------------------------------------------------------- diff --git a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/Aggregations.java b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/Aggregations.java index 8713c86..c2eee98 100644 --- a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/Aggregations.java +++ b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/Aggregations.java @@ -19,7 +19,6 @@ under the License. package org.apache.edgent.analytics.math3; import java.util.Collection; -import java.util.HashMap; import org.apache.edgent.analytics.math3.json.JsonAnalytics; import org.apache.edgent.analytics.math3.stat.Regression2; @@ -160,19 +159,6 @@ public class Aggregations { sum += v.longValue(); return sum; } - - /** - * Aggregation results for a single aggregated variable. - */ - public static class ResultMap extends HashMap<UnivariateAggregate,Double> { - private static final long serialVersionUID = 1L; - } - - /** - * Create a new empty {@link ResultMap}. - * @return the ResultMap. - */ - public static ResultMap newResults() { return new ResultMap(); } /** * Create a {@link Function} whose {@code apply(ResultMap)} converts the value @@ -188,20 +174,6 @@ public class Aggregations { } /** - * Aggregation results for a multiple aggregated variables. - * <p>The name of the aggregated variable is typically the key for the variable's {@link ResultMap}. - */ - public static class MvResultMap extends HashMap<String,ResultMap> { - private static final long serialVersionUID = 1L; - }; - - /** - * Create a new empty {@link MvResultMap}. - * @return the MvResultMap. - */ - public static MvResultMap newMvResults() { return new MvResultMap(); } - - /** * Create a {@link Function} whose {@code apply(MvResultMap)} converts the value * to a {@code JsonObject}. The MvResultMap's key's names are the JsonObject property * names and the property value is the JsonObject for the key's ResultMap value. @@ -281,7 +253,7 @@ public class Aggregations { public static <T> ResultMap aggregateN(Collection<T> c, ToDoubleFunction<T> getter, UnivariateAggregate... aggregates) { final int n = c.size(); - final ResultMap result = newResults(); + final ResultMap result = new ResultMap(); if (n != 0) { // get new UnivariateAggregate instances for this aggregation http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34230cfb/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/MvResultMap.java ---------------------------------------------------------------------- diff --git a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/MvResultMap.java b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/MvResultMap.java new file mode 100644 index 0000000..b1b9f8a --- /dev/null +++ b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/MvResultMap.java @@ -0,0 +1,12 @@ +package org.apache.edgent.analytics.math3; + +import java.util.HashMap; + +/** + * Aggregation results for multiple aggregated variables. + * + * <p>The name of the aggregated variable is typically the key for the variable's {@link ResultMap}. + */ +public class MvResultMap extends HashMap<String,ResultMap> { + private static final long serialVersionUID = 1L; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34230cfb/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/ResultMap.java ---------------------------------------------------------------------- diff --git a/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/ResultMap.java b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/ResultMap.java new file mode 100644 index 0000000..3dd883a --- /dev/null +++ b/analytics/math3/src/main/java/org/apache/edgent/analytics/math3/ResultMap.java @@ -0,0 +1,10 @@ +package org.apache.edgent.analytics.math3; + +import java.util.HashMap; + +/** + * Aggregation results for a single aggregated variable. + */ +public class ResultMap extends HashMap<UnivariateAggregate,Double> { + private static final long serialVersionUID = 1L; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34230cfb/analytics/math3/src/test/java/org/apache/edgent/test/analytics/math3/Statistics2Test.java ---------------------------------------------------------------------- diff --git a/analytics/math3/src/test/java/org/apache/edgent/test/analytics/math3/Statistics2Test.java b/analytics/math3/src/test/java/org/apache/edgent/test/analytics/math3/Statistics2Test.java index 6e463a2..f794601 100644 --- a/analytics/math3/src/test/java/org/apache/edgent/test/analytics/math3/Statistics2Test.java +++ b/analytics/math3/src/test/java/org/apache/edgent/test/analytics/math3/Statistics2Test.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; import org.apache.edgent.analytics.math3.Aggregations; -import org.apache.edgent.analytics.math3.Aggregations.MvResultMap; -import org.apache.edgent.analytics.math3.Aggregations.ResultMap; +import org.apache.edgent.analytics.math3.MvResultMap; +import org.apache.edgent.analytics.math3.ResultMap; import org.apache.edgent.analytics.math3.UnivariateAggregate; import org.apache.edgent.analytics.math3.stat.Regression2; import org.apache.edgent.analytics.math3.stat.Statistic2; @@ -325,7 +325,7 @@ public class Statistics2Test extends TopologyAbstractTest implements DirectTest /* test Aggregations.newResultToJson() */ @Test public void testNewResultsToJson() throws Exception { - ResultMap result = Aggregations.newResults(); + ResultMap result = new ResultMap(); result.put(Statistic2.MIN, 2.5); result.put(Statistic2.MAX, 4.5); @@ -340,14 +340,14 @@ public class Statistics2Test extends TopologyAbstractTest implements DirectTest /* test Aggregations.newMvResultToJson() */ @Test public void testNewMvResultsToJson() throws Exception { - ResultMap var1result = Aggregations.newResults(); + ResultMap var1result = new ResultMap(); var1result.put(Statistic2.MIN, 2.5); var1result.put(Statistic2.MAX, 4.5); - ResultMap var2result = Aggregations.newResults(); + ResultMap var2result = new ResultMap(); var2result.put(Statistic2.SUM, 27.1); - MvResultMap result = Aggregations.newMvResults(); + MvResultMap result = new MvResultMap(); result.put("var1", var1result); result.put("var2", var2result); @@ -422,7 +422,7 @@ public class Statistics2Test extends TopologyAbstractTest implements DirectTest TStream<MvResultMap> aggregate = window.aggregate( (list,partition) -> { ResultMap var1result = Aggregations.aggregateN(list, sr -> sr.var1, stats); ResultMap var2result = Aggregations.aggregateN(list, sr -> sr.var2, stats); - MvResultMap result = Aggregations.newMvResults(); + MvResultMap result = new MvResultMap(); result.put("var1", var1result); result.put("var2", var2result); return result;
