You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/18 16:23:20 UTC
incubator-tinkerpop git commit: fixed typing bugs in XXXLocalStep
variants. Ensuring consistetancy with XXXGlobalStep.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 855408f71 -> 06a573cf6
fixed typing bugs in XXXLocalStep variants. Ensuring consistetancy with XXXGlobalStep.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/06a573cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/06a573cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/06a573cf
Branch: refs/heads/master
Commit: 06a573cf65246787721b6a22e32d6596ce0686e3
Parents: 855408f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 18 08:23:20 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 18 08:23:20 2015 -0700
----------------------------------------------------------------------
.../graph/traversal/step/map/MaxGlobalStep.java | 2 +-
.../graph/traversal/step/map/MaxLocalStep.java | 16 ++++++++--------
.../graph/traversal/step/map/MeanLocalStep.java | 10 +++++-----
.../graph/traversal/step/map/MinLocalStep.java | 16 ++++++++--------
.../graph/traversal/step/map/SampleLocalStep.java | 7 ++++++-
.../graph/traversal/step/map/SumLocalStep.java | 10 +++++-----
6 files changed, 33 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
index cdd3bbc..7e013d4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
@@ -37,7 +37,7 @@ public final class MaxGlobalStep<S extends Number> extends ReducingBarrierStep<S
public MaxGlobalStep(final Traversal.Admin traversal) {
super(traversal);
- this.setSeedSupplier(new ConstantSupplier<>((S) Double.valueOf(-Double.MAX_VALUE)));
+ this.setSeedSupplier(new ConstantSupplier<>((S) Double.valueOf(Double.MIN_VALUE)));
this.setBiFunction(MaxBiFunction.<S>instance());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
index a333bde..2379f49 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxLocalStep.java
@@ -38,16 +38,16 @@ public final class MaxLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Double result;
- final Iterator<E> iter = traverser.get().iterator();
- if (iter.hasNext()) {
- result = (Double) iter.next();
- while (iter.hasNext()) {
- final Double curr = (Double) iter.next();
- if (result < curr) result = curr;
+ Number result;
+ final Iterator<E> iterator = traverser.get().iterator();
+ if (iterator.hasNext()) {
+ result = iterator.next();
+ while (iterator.hasNext()) {
+ final Number curr = iterator.next();
+ if (result.doubleValue() < curr.doubleValue()) result = curr;
}
} else {
- result = Double.NaN;
+ result = Double.MIN_VALUE;
}
return (E) result;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanLocalStep.java
index a0b1fb8..6953334 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MeanLocalStep.java
@@ -38,12 +38,12 @@ public final class MeanLocalStep<E extends Number, S extends Iterable<E>> extend
@Override
protected Double map(final Traverser.Admin<S> traverser) {
- final Iterator<E> iter = traverser.get().iterator();
- if (iter.hasNext()) {
+ final Iterator<E> iterator = traverser.get().iterator();
+ if (iterator.hasNext()) {
Long counter = 1L;
- Double result = (Double) iter.next();
- while (iter.hasNext()) {
- result += (Double) iter.next();
+ Double result = iterator.next().doubleValue();
+ while (iterator.hasNext()) {
+ result += iterator.next().doubleValue();
counter++;
}
return result / counter;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
index cae3892..47bb0a0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MinLocalStep.java
@@ -38,16 +38,16 @@ public final class MinLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Double result;
- final Iterator<E> iter = traverser.get().iterator();
- if (iter.hasNext()) {
- result = (Double) iter.next();
- while (iter.hasNext()) {
- final Double curr = (Double) iter.next();
- if (result > curr) result = curr;
+ Number result;
+ final Iterator<E> iterator = traverser.get().iterator();
+ if (iterator.hasNext()) {
+ result = iterator.next();
+ while (iterator.hasNext()) {
+ final Number curr = iterator.next();
+ if (result.doubleValue() > curr.doubleValue()) result = curr;
}
} else {
- result = Double.NaN;
+ result = Double.MAX_VALUE;
}
return (E) result;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SampleLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SampleLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SampleLocalStep.java
index 83744f0..6bf09fb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SampleLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SampleLocalStep.java
@@ -25,7 +25,12 @@ import org.apache.tinkerpop.gremlin.process.Traverser;
import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.util.BulkSet;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06a573cf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumLocalStep.java
index 600e2b2..468862a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/SumLocalStep.java
@@ -39,11 +39,11 @@ public final class SumLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
Double result;
- final Iterator<E> iter = traverser.get().iterator();
- if (iter.hasNext()) {
- result = (Double) iter.next();
- while (iter.hasNext()) {
- result += (Double) iter.next();
+ final Iterator<E> iterator = traverser.get().iterator();
+ if (iterator.hasNext()) {
+ result = iterator.next().doubleValue();
+ while (iterator.hasNext()) {
+ result += iterator.next().doubleValue();
}
} else {
result = Double.NaN;