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/06/23 22:25:59 UTC
incubator-tinkerpop git commit: renamed selectivity to multiplicity
as @mbroecheler says I had the terminology backwards.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 1707cf2be -> 6529b52f6
renamed selectivity to multiplicity as @mbroecheler says I had the terminology backwards.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6529b52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6529b52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6529b52f
Branch: refs/heads/master
Commit: 6529b52f62efa641e356eed25e2e1c1c24226ed4
Parents: 1707cf2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 23 14:25:54 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 23 14:25:54 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/map/MatchStep.java | 8 +++---
.../traversal/step/map/MatchStepTest.java | 30 ++++++++++----------
.../tinkergraph/structure/TinkerGraphTest.java | 18 ------------
3 files changed, 19 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6529b52f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
index 3e82b9e..d22446c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
@@ -554,7 +554,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
final Bundle bundle = this.getBundle(traversal);
bundle.endsCount++;
bundle.calculateSelectivity();
- Collections.sort(this.traversalBundles, Comparator.<Bundle>comparingInt(r -> r.traversalType.ordinal()).thenComparingDouble(r -> r.selectivity));
+ Collections.sort(this.traversalBundles, Comparator.<Bundle>comparingInt(r -> r.traversalType.ordinal()).thenComparingDouble(r -> r.multiplicity));
}
protected Bundle getBundle(final Traversal.Admin<Object, Object> traversal) {
@@ -571,7 +571,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
public Type traversalType;
public long startsCount;
public long endsCount;
- public double selectivity;
+ public double multiplicity;
public static Bundle of(final Traversal.Admin<Object, Object> traversal) {
final Bundle bundle = new Bundle();
@@ -582,12 +582,12 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
//bundle.bindingLabel = MatchAlgorithm.getBindingLabel(traversal).orElse(null);
bundle.startsCount = 0l;
bundle.endsCount = 0l;
- bundle.selectivity = 0.0d;
+ bundle.multiplicity = 0.0d;
return bundle;
}
public final void calculateSelectivity() {
- this.selectivity = (double) this.endsCount / (double) this.startsCount;
+ this.multiplicity = (double) this.endsCount / (double) this.startsCount;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6529b52f/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
index d9217c1..677f76a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
@@ -197,7 +197,7 @@ public class MatchStepTest extends StepTest {
Traversal.Admin<Object, Object> secondPattern = ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren().get(1);
//
assertEquals(2, countMatchAlgorithm.traversalBundles.size());
- countMatchAlgorithm.traversalBundles.stream().forEach(bundle -> assertEquals(0.0d, bundle.selectivity, 0.0d));
+ countMatchAlgorithm.traversalBundles.stream().forEach(bundle -> assertEquals(0.0d, bundle.multiplicity, 0.0d));
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
countMatchAlgorithm.recordStart(EmptyTraverser.instance(), firstPattern);
@@ -222,15 +222,15 @@ public class MatchStepTest extends StepTest {
assertEquals(3l, countMatchAlgorithm.getBundle(secondPattern).startsCount);
assertEquals(1l, countMatchAlgorithm.getBundle(firstPattern).endsCount);
assertEquals(3l, countMatchAlgorithm.getBundle(secondPattern).endsCount);
- assertEquals(0.5d, countMatchAlgorithm.getBundle(firstPattern).selectivity, 0.01d);
- assertEquals(1.0d, countMatchAlgorithm.getBundle(secondPattern).selectivity, 0.01d);
+ assertEquals(0.5d, countMatchAlgorithm.getBundle(firstPattern).multiplicity, 0.01d);
+ assertEquals(1.0d, countMatchAlgorithm.getBundle(secondPattern).multiplicity, 0.01d);
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
// CHECK RE-SORTING AS MORE DATA COMES IN
countMatchAlgorithm.recordEnd(EmptyTraverser.instance(), firstPattern);
countMatchAlgorithm.recordEnd(EmptyTraverser.instance(), firstPattern);
- assertEquals(1.5d, countMatchAlgorithm.getBundle(firstPattern).selectivity, 0.01d);
- assertEquals(1.0d, countMatchAlgorithm.getBundle(secondPattern).selectivity, 0.01d);
+ assertEquals(1.5d, countMatchAlgorithm.getBundle(firstPattern).multiplicity, 0.01d);
+ assertEquals(1.0d, countMatchAlgorithm.getBundle(secondPattern).multiplicity, 0.01d);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
@@ -244,7 +244,7 @@ public class MatchStepTest extends StepTest {
secondPattern = ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren().get(1);
Traversal.Admin<Object, Object> thirdPattern = ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren().get(2);
///
- countMatchAlgorithm.traversalBundles.stream().forEach(bundle -> assertEquals(0.0d, bundle.selectivity, 0.0d));
+ countMatchAlgorithm.traversalBundles.stream().forEach(bundle -> assertEquals(0.0d, bundle.multiplicity, 0.0d));
assertEquals(MatchStep.MatchAlgorithm.Type.MATCH_TRAVERSAL, countMatchAlgorithm.getBundle(firstPattern).traversalType);
assertEquals(MatchStep.MatchAlgorithm.Type.MATCH_TRAVERSAL, countMatchAlgorithm.getBundle(secondPattern).traversalType);
assertEquals(MatchStep.MatchAlgorithm.Type.WHERE_PREDICATE, countMatchAlgorithm.getBundle(thirdPattern).traversalType);
@@ -259,9 +259,9 @@ public class MatchStepTest extends StepTest {
assertEquals(1l, countMatchAlgorithm.getBundle(firstPattern).endsCount);
assertEquals(0l, countMatchAlgorithm.getBundle(secondPattern).endsCount);
assertEquals(0l, countMatchAlgorithm.getBundle(thirdPattern).endsCount);
- assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).selectivity, 0.01d);
- assertEquals(0.0d, countMatchAlgorithm.getBundle(secondPattern).selectivity, 0.01d);
- assertEquals(0.0d, countMatchAlgorithm.getBundle(thirdPattern).selectivity, 0.01d);
+ assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).multiplicity, 0.01d);
+ assertEquals(0.0d, countMatchAlgorithm.getBundle(secondPattern).multiplicity, 0.01d);
+ assertEquals(0.0d, countMatchAlgorithm.getBundle(thirdPattern).multiplicity, 0.01d);
assertEquals(thirdPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(2).traversal);
@@ -281,9 +281,9 @@ public class MatchStepTest extends StepTest {
assertEquals(1l, countMatchAlgorithm.getBundle(firstPattern).endsCount);
assertEquals(0l, countMatchAlgorithm.getBundle(secondPattern).endsCount);
assertEquals(6l, countMatchAlgorithm.getBundle(thirdPattern).endsCount);
- assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).selectivity, 0.01d);
- assertEquals(0.0d, countMatchAlgorithm.getBundle(secondPattern).selectivity, 0.01d);
- assertEquals(2.0d, countMatchAlgorithm.getBundle(thirdPattern).selectivity, 0.01d);
+ assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).multiplicity, 0.01d);
+ assertEquals(0.0d, countMatchAlgorithm.getBundle(secondPattern).multiplicity, 0.01d);
+ assertEquals(2.0d, countMatchAlgorithm.getBundle(thirdPattern).multiplicity, 0.01d);
assertEquals(thirdPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(2).traversal);
@@ -304,9 +304,9 @@ public class MatchStepTest extends StepTest {
assertEquals(1l, countMatchAlgorithm.getBundle(firstPattern).endsCount);
assertEquals(6l, countMatchAlgorithm.getBundle(secondPattern).endsCount);
assertEquals(6l, countMatchAlgorithm.getBundle(thirdPattern).endsCount);
- assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).selectivity, 0.01d);
- assertEquals(1.5d, countMatchAlgorithm.getBundle(secondPattern).selectivity, 0.01d);
- assertEquals(2.0d, countMatchAlgorithm.getBundle(thirdPattern).selectivity, 0.01d);
+ assertEquals(1.0d, countMatchAlgorithm.getBundle(firstPattern).multiplicity, 0.01d);
+ assertEquals(1.5d, countMatchAlgorithm.getBundle(secondPattern).multiplicity, 0.01d);
+ assertEquals(2.0d, countMatchAlgorithm.getBundle(thirdPattern).multiplicity, 0.01d);
assertEquals(thirdPattern, countMatchAlgorithm.traversalBundles.get(0).traversal);
assertEquals(firstPattern, countMatchAlgorithm.traversalBundles.get(1).traversal);
assertEquals(secondPattern, countMatchAlgorithm.traversalBundles.get(2).traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6529b52f/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index b57a836..1e50d2d 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -227,18 +227,6 @@ public class TinkerGraphTest {
graph.io(GraphMLIo.build()).readGraph("/Users/marko/software/tinkerpop/tinkerpop3/data/grateful-dead.xml");
GraphTraversalSource g = graph.traversal(GraphTraversalSource.standard());
- /*final Supplier<Traversal<?, ?>> traversal = () ->
- g.V().match("a",
- where("a", P.neq("c")),
- as("a").out("created").as("b"),
- or(
- as("a").out("knows").has("name", "vadas"),
- as("a").in("knows").and().as("a").has(T.label, "person")
- ),
- as("b").in("created").as("c"),
- as("b").in("created").count().is(P.gt(1)))
- .select(); */
-
final Supplier<Traversal<?,?>> traversal = () ->
g.V().match("a",
as("a").has("name", "Garcia"),
@@ -247,17 +235,11 @@ public class TinkerGraphTest {
as("c").out("writtenBy").as("d"),
as("d").where(P.neq("a"))).select().by("name");
- /*final Supplier<Traversal<?,?>> traversal = () ->
- g.V().as("a").out().as("b").where(
- not(in("knows").as("a")).and().as("b").in().count().is(P.gt(1))
- ).select().by("name"); */
System.out.println(traversal.get());
System.out.println(traversal.get().iterate());
traversal.get().forEachRemaining(System.out::println);
- //System.out.println(g.V().and(out("created"),or(out("knows"),out("created").has("name","ripple"))).values("name").iterate());
- //g.V().and(out("created"),or(out("knows"),out("created").has("name","ripple"))).values("name").forEachRemaining(System.out::println);
}
@Test