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/07/06 23:50:11 UTC
[1/2] incubator-tinkerpop git commit: doc updates.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 6cdea4a11 -> a8be95d0d
doc updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dd4e954c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dd4e954c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dd4e954c
Branch: refs/heads/master
Commit: dd4e954c0dc7f6535ca8bd15935c6b7db1a83b24
Parents: 6cdea4a
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 6 13:00:20 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 6 13:00:39 2015 -0600
----------------------------------------------------------------------
docs/src/intro.asciidoc | 2 +-
docs/src/the-graphcomputer.asciidoc | 2 +-
docs/src/the-traversal.asciidoc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dd4e954c/docs/src/intro.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/intro.asciidoc b/docs/src/intro.asciidoc
index a12d0ac..af7cb58 100644
--- a/docs/src/intro.asciidoc
+++ b/docs/src/intro.asciidoc
@@ -191,7 +191,7 @@ The return type of `V()` and `E()` is a `GraphTraversal`. A GraphTraversal maint
. `flatMap`: transform the incoming traverser's object to an iterator of other objects (S → E^*^).
. `filter`: allow or disallow the traverser from proceeding to the next step (S → S ∪ ∅).
. `sideEffect`: allow the traverser to proceed unchanged, but yield some computational sideEffect in the process (S ↬ S).
- . `branch`: split the traverser and send each to an arbitrary location in the traversal (S ⇒ S~1~, S~2~, ..., S~n~).
+ . `branch`: split the traverser and send each to an arbitrary location in the traversal (S ⇒ { S~1~ → E^*^, ..., S~n~ → E^*^ } → E^*^).
Nearly every step in GraphTraversal either extends `MapStep`, `FlatMapStep`, `FilterStep`, `SideEffectStep`, or `BranchStep`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dd4e954c/docs/src/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-graphcomputer.asciidoc b/docs/src/the-graphcomputer.asciidoc
index c176c73..3b65413 100644
--- a/docs/src/the-graphcomputer.asciidoc
+++ b/docs/src/the-graphcomputer.asciidoc
@@ -240,7 +240,7 @@ The `PeerPressureVertexProgram` is a clustering algorithm that assigns a nominal
TraversalVertexProgram
~~~~~~~~~~~~~~~~~~~~~~
-image:traversal-vertex-program.png[width=250,float=left] The `TraversalVertexProgram` is a "special" VertexProgram in that it can be executed via `GraphTraversal` and the submit `:>` command in <<gremlin-console,Gremlin Console>>. In Gremlin, it is possible to have the same traversal executed using either the standard OTLP-engine or the `GraphComputer` OLAP-engine. The difference being where the traversal is submitted.
+image:traversal-vertex-program.png[width=250,float=left] The `TraversalVertexProgram` is a "special" VertexProgram in that it can be executed via a `GraphTraversal` with a `ComputerTraversalEngine`. In Gremlin, it is possible to have the same traversal executed using either the standard OTLP-engine or the `GraphComputer` OLAP-engine. The difference being where the traversal is submitted.
NOTE: This model of graph traversal in a BSP system was first implemented by the link:http://faunus.thinkaurelius.com[Faunus] graph analytics engine and originally described in link:http://markorodriguez.com/2011/04/19/local-and-distributed-traversal-engines/[Local and Distributed Traversal Engines].
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dd4e954c/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc
index 699d3de..5d4b245 100644
--- a/docs/src/the-traversal.asciidoc
+++ b/docs/src/the-traversal.asciidoc
@@ -37,7 +37,7 @@ Graph Traversal Steps
image::step-types.png[width=650]
-A `GraphTraversal<S,E>` can be spawned off of a `Graph`, `Vertex`, `Edge`, or `VertexProperty`. It can also be spawned anonymously (i.e. empty) via `__`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal` inherit from the more general forms diagrammed above. A list of all the steps (and their descriptions) are provided in the TinkerPop3 link:http://www.tinkerpop.com/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/graph/GraphTraversal.html[GraphTraversal JavaDoc]. The following subsections will demonstrate the GraphTraversal steps using the <<gremlin-console,Gremlin Console>>.
+A `GraphTraversal<S,E>` is spawned from a `GraphTraversalSource`. It can also be spawned anonymously (i.e. empty) via `__`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal` inherit from the more general forms diagrammed above. A list of all the steps (and their descriptions) are provided in the TinkerPop3 link:http://www.tinkerpop.com/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/graph/GraphTraversal.html[GraphTraversal JavaDoc]. The following subsections will demonstrate the GraphTraversal steps using the <<gremlin-console,Gremlin Console>>.
NOTE: To reduce the verbosity of the expression, it is good to `import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*`. This way, instead of doing `__.inE()` for an anonymous traversal, it is possible to simply write `inE()`. Be aware of language-specific reserved keywords when using anonymous traversals. For example, `in` and `as` are reserved keywords in Groovy, therefore you must use the verbose syntax `__.in()` and `__.as()` to avoid collisions.
[2/2] incubator-tinkerpop git commit: fixed a bug in branch-lambda
png. tweaks to mathematical representation of branch().
Posted by ok...@apache.org.
fixed a bug in branch-lambda png. tweaks to mathematical representation of branch().
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a8be95d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a8be95d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a8be95d0
Branch: refs/heads/master
Commit: a8be95d0dbca16c99a43310d42e4eb8b3c528380
Parents: dd4e954
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 6 13:38:50 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 6 13:38:50 2015 -0600
----------------------------------------------------------------------
docs/src/intro.asciidoc | 4 ++--
docs/static/images/branch-lambda.png | Bin 35192 -> 32812 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8be95d0/docs/src/intro.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/intro.asciidoc b/docs/src/intro.asciidoc
index af7cb58..a7bc4c4 100644
--- a/docs/src/intro.asciidoc
+++ b/docs/src/intro.asciidoc
@@ -188,10 +188,10 @@ Traversals in Gremlin are spawned from a `TraversalSource`. The `GraphTraversalS
The return type of `V()` and `E()` is a `GraphTraversal`. A GraphTraversal maintains numerous methods that return GraphTraversal. In this way, a GraphTraversal supports function composition. Each method of GraphTraversal is called a step and each step modulates the results of the previous step in one of five general ways.
. `map`: transform the incoming traverser's object to another object (S → E).
- . `flatMap`: transform the incoming traverser's object to an iterator of other objects (S → E^*^).
+ . `flatMap`: transform the incoming traverser's object to an iterator of other objects (S → E*).
. `filter`: allow or disallow the traverser from proceeding to the next step (S → S ∪ ∅).
. `sideEffect`: allow the traverser to proceed unchanged, but yield some computational sideEffect in the process (S ↬ S).
- . `branch`: split the traverser and send each to an arbitrary location in the traversal (S ⇒ { S~1~ → E^*^, ..., S~n~ → E^*^ } → E^*^).
+ . `branch`: split the traverser and send each to an arbitrary location in the traversal (S → { S~1~ → E*, ..., S~n~ → E* } → E*).
Nearly every step in GraphTraversal either extends `MapStep`, `FlatMapStep`, `FilterStep`, `SideEffectStep`, or `BranchStep`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8be95d0/docs/static/images/branch-lambda.png
----------------------------------------------------------------------
diff --git a/docs/static/images/branch-lambda.png b/docs/static/images/branch-lambda.png
index 2c04356..1bafa94 100644
Binary files a/docs/static/images/branch-lambda.png and b/docs/static/images/branch-lambda.png differ