You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/11/05 02:56:46 UTC
[28/50] [abbrv] incubator-tinkerpop git commit: integrated
NumnerHelper in MeanLocalStep
integrated NumnerHelper in MeanLocalStep
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/baf2ae04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/baf2ae04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/baf2ae04
Branch: refs/heads/TINKERPOP3-923
Commit: baf2ae04c32b1497bb72ab69f9264f793c085280
Parents: dfa61c9
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Nov 3 15:51:43 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Nov 3 15:51:43 2015 +0100
----------------------------------------------------------------------
.../process/traversal/step/map/MeanLocalStep.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/baf2ae04/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
index e2db6af..fab03bb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
+import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
@@ -30,23 +31,23 @@ import java.util.Set;
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Daniel Kuppitz (http://gremlin.guru)
*/
-public final class MeanLocalStep<E extends Number, S extends Iterable<E>> extends MapStep<S, Double> {
+public final class MeanLocalStep<E extends Number, S extends Iterable<E>> extends MapStep<S, Number> {
public MeanLocalStep(final Traversal.Admin traversal) {
super(traversal);
}
@Override
- protected Double map(final Traverser.Admin<S> traverser) {
+ protected Number map(final Traverser.Admin<S> traverser) {
final Iterator<E> iterator = traverser.get().iterator();
if (iterator.hasNext()) {
Long counter = 1L;
- Double result = iterator.next().doubleValue();
+ E result = iterator.next();
while (iterator.hasNext()) {
- result += iterator.next().doubleValue();
+ result = (E) NumberHelper.add(result, iterator.next());
counter++;
}
- return result / counter;
+ return NumberHelper.div(result, counter, true);
} else {
return Double.NaN;
}