You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2019/09/26 02:08:24 UTC

[lucene-solr] branch SOLR-13105-visual updated: SOLR-13105: Update text inline tocs 11

This is an automated email from the ASF dual-hosted git repository.

jbernste pushed a commit to branch SOLR-13105-visual
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/SOLR-13105-visual by this push:
     new 0ec7f7e  SOLR-13105: Update text inline tocs 11
0ec7f7e is described below

commit 0ec7f7e945a20269b1da01b00b530799bee60b77
Author: Joel Bernstein <jb...@apache.org>
AuthorDate: Wed Sep 25 22:08:05 2019 -0400

    SOLR-13105: Update text inline tocs 11
---
 solr/solr-ref-guide/src/dsp.adoc          |   7 ++
 solr/solr-ref-guide/src/matrix-math.adoc  | 127 ++++++++++++++++--------------
 solr/solr-ref-guide/src/term-vectors.adoc |  30 ++++---
 3 files changed, 91 insertions(+), 73 deletions(-)

diff --git a/solr/solr-ref-guide/src/dsp.adoc b/solr/solr-ref-guide/src/dsp.adoc
index 9a33ae5..b763e45 100644
--- a/solr/solr-ref-guide/src/dsp.adoc
+++ b/solr/solr-ref-guide/src/dsp.adoc
@@ -19,6 +19,13 @@
 This section of the user guide explores functions that are commonly used in the field of
 Digital Signal Processing (DSP).
 
+<<Convolution, Convolution>> -
+<<Cross-Correlation, Cross-Correlation>> -
+<<Find Delay, Find Delay>> -
+<<Oscillate (Sine Wave), Oscillate (Sine Wave)>> -
+<<Autocorrelation, Autocorrelation>> -
+<<Discrete Fourier Transform, Discrete Fourier Transform>>
+
 == Convolution
 
 The `conv` function calculates the convolution of two vectors. The convolution is calculated by reversing
diff --git a/solr/solr-ref-guide/src/matrix-math.adoc b/solr/solr-ref-guide/src/matrix-math.adoc
index b5cce75..d3f3997 100644
--- a/solr/solr-ref-guide/src/matrix-math.adoc
+++ b/solr/solr-ref-guide/src/matrix-math.adoc
@@ -16,12 +16,22 @@
 // specific language governing permissions and limitations
 // under the License.
 
-This section of the user guide covers the
-basics of matrix creation, manipulation and matrix math. Other sections
-of the user guide demonstrate how matrices are used by the statistics,
-probability and machine learning functions.
-
-== Matrix Creation
+Matrices are used
+as both inputs and outputs of many mathematical functions.
+This section of the user guide covers the basics of matrix creation,
+manipulation and matrix math.
+
+<<Matrix Function, Matrix Function >> -
+<<Accessing Rows and Columns, Rows and Columns>> -
+<<Row and Column Labels, Labels>> -
+<<Pair Sorting, Pair Sorting>> -
+<<Attributes, Attributes>> -
+<<Dimensions, Dimensions>> -
+<<Transposition, Transposition>> -
+<<Summations, Summations>> -
+<<Scalar Matrix Math, Matrix Math>>
+
+== Matrix Function
 
 A matrix can be created with the `matrix` function.
 The matrix function is passed a list of `arrays` with
@@ -103,6 +113,60 @@ responds with:
 }
 ----
 
+== Row and Column Labels
+
+A matrix can have column and rows and labels. The functions
+`setRowLabels`, `setColumnLabels`, `getRowLabels` and `getColumnLabels`
+can be used to set and get the labels. The label values
+are set using string arrays.
+
+The example below sets the row and column labels. In other sections of the
+user guide examples are shown where functions return matrices
+with the labels already set.
+
+Below is a simple example of setting and
+getting row and column labels
+on a matrix.
+
+[source,text]
+----
+let(echo="d, e",
+    a=matrix(array(1, 2),
+             array(4, 5)),
+    b=setRowLabels(a, array("row0", "row1")),
+    c=setColumnLabels(b, array("col0", "col1")),
+    d=getRowLabels(c),
+    e=getColumnLabels(c))
+----
+
+When this expression is sent to the `/stream` handler it
+responds with:
+
+[source,json]
+----
+{
+  "result-set": {
+    "docs": [
+      {
+        "d": [
+          "row0",
+          "row1"
+        ],
+        "e": [
+          "col0",
+          "col1"
+        ]
+      },
+      {
+        "EOF": true,
+        "RESPONSE_TIME": 0
+      }
+    ]
+  }
+}
+----
+
+
 == Pair Sorting Vectors
 
 The `pairSort` function can be used to sort two vectors based on the values in
@@ -156,58 +220,7 @@ responds with:
 ----
 
 
-== Row and Column Labels
-
-A matrix can have column and rows and labels. The functions
-`setRowLabels`, `setColumnLabels`, `getRowLabels` and `getColumnLabels`
-can be used to set and get the labels. The label values
-are set using string arrays.
-
-The example below sets the row and column labels. In other sections of the
-user guide examples are shown where functions return matrices
-with the labels already set.
-
-Below is a simple example of setting and
-getting row and column labels
-on a matrix.
-
-[source,text]
-----
-let(echo="d, e",
-    a=matrix(array(1, 2),
-             array(4, 5)),
-    b=setRowLabels(a, array("row0", "row1")),
-    c=setColumnLabels(b, array("col0", "col1")),
-    d=getRowLabels(c),
-    e=getColumnLabels(c))
-----
 
-When this expression is sent to the `/stream` handler it
-responds with:
-
-[source,json]
-----
-{
-  "result-set": {
-    "docs": [
-      {
-        "d": [
-          "row0",
-          "row1"
-        ],
-        "e": [
-          "col0",
-          "col1"
-        ]
-      },
-      {
-        "EOF": true,
-        "RESPONSE_TIME": 0
-      }
-    ]
-  }
-}
-----
 
 == Matrix Attributes
 
diff --git a/solr/solr-ref-guide/src/term-vectors.adoc b/solr/solr-ref-guide/src/term-vectors.adoc
index 25e2281..3fcf2dd 100644
--- a/solr/solr-ref-guide/src/term-vectors.adoc
+++ b/solr/solr-ref-guide/src/term-vectors.adoc
@@ -122,40 +122,38 @@ field into a stream of tuples. When the `analyze` function is used
 to create the multivalued field, the `cartesianProduct` function will
 explode the analyzed tokens into a stream of tuples. This allows
 analytics to be performed over the stream of analyzed tokens and the result
-to be visualized.
+to be visualized with Zeppelin-Solr.
 
 *Example: Phrase Aggregation*
 
-An example of phrase aggregation is used to illustrate the power of combining
+An example performing phrase aggregation is used to illustrate the power of combining
 `cartesianProduct` and `analyze`.
 
 In this example the `search` expression is performed over a collection of movie reviews.
-The phrase query "Man of Fire" is searched for and the top 5000 results, by score are
+The phrase query "Man on Fire" is searched for and the top 5000 results, by score are
 returned. A single field from the results is return which is the "review_t" field that
-contains text of th movie review.
+contains text of the movie review.
 
-Then `cartesiaProduct` function is run over search results. The `cartesianProduct`
-function applies the `analyze` function, which takes the *review_t* and analyzes
-it with the Lucene/Solr analyzer attached to the *text_bigrams* field. This analyzer
+Then `cartesiaProduct` function is run over the search results. The `cartesianProduct`
+function applies the `analyze` function, which takes the *review_t* field and analyzes
+it with the Lucene/Solr analyzer attached to the *text_bigrams* schema field. This analyzer
 emits the bigrams found in the text field. The `cartesianProduct` function explodes each
 bigram into its own tuple with the bigram stored in the field *term*.
 
-The stream of tuples each containing a bigram is then filtered by the `having` function
-using regular expressions select bigrams with a length of 12 or greater and that
-don't contain specific characters.
+The stream of tuples, each containing a bigram, is then filtered by the `having` function
+using regular expressions to select bigrams with a length of 12 or greater and to filter
+out bigrams that contain specific characters.
 
-The `hashRollup` function aggregates the bigrams and the `top` function emits the top
+The `hashRollup` function then aggregates the bigrams and the `top` function emits the top
 10 bigrams by count.
 
 Then Zeppelin-Solr is used to visualize the top 10 ten bigrams.
 
-
 image::images/math-expressions/text-analytics.png[]
 
-The Lucene/Solr analyzers can be configured in many different ways to allow for
-aggregations of NLP entities (people, places, companies etc...), tokens generated
-from regexes or extracted using dictionaries.
-
+Lucene/Solr analyzers can be configured in many different ways to support
+aggregations over NLP entities (people, places, companies etc...) as well as
+tokens extracted with regular expressions or dictionaries.
 
 == TF-IDF Term Vectors