[datasketches-java] 01/01: Merge branch 'master' into Changes_to_Classic_Quantiles

[le...@apache.org]

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

leerho pushed a commit to branch Changes_to_Classic_Quantiles
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git

commit 72c769036e098fb4cce78612bf08e8bdb2f8538e
Merge: f0d5e1b1 a4893d35
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Aug 16 13:05:14 2022 -0700

    Merge branch 'master' into Changes_to_Classic_Quantiles
    
    Fixed conflicts

 src/main/java/org/apache/datasketches/DoublesSortedView.java |  6 +++---
 src/main/java/org/apache/datasketches/FloatsSortedView.java  |  6 +++---
 src/main/java/org/apache/datasketches/GenericSortedView.java | 11 +++++++++--
 src/main/java/org/apache/datasketches/SortedView.java        |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --cc src/main/java/org/apache/datasketches/DoublesSortedView.java
index a07eae68,761f53da..d449d86c
--- a/src/main/java/org/apache/datasketches/DoublesSortedView.java
+++ b/src/main/java/org/apache/datasketches/DoublesSortedView.java
@@@ -50,11 -50,11 +50,11 @@@ public interface DoublesSortedView exte
     * <p>If <i>isCdf</i> is true, the points in the returned array are monotonically increasing and end with the
     * value 1.0. Each value represents a point along the cumulative distribution function that approximates
     * the CDF of the input data stream. Therefore, each point represents the fractional density of the distribution
 -   * between from zero. For example, if one of the returned values is 0.5, then the splitPoint corresponding to that
 -   * value would be the median of the distribution.</p>
 +   * from zero to the given point. For example, if one of the returned values is 0.5, then the splitPoint corresponding
 +   * to that value would be the median of the distribution.</p>
     *
-    * <p>If <i>isCdf</i> is false, the points in the returned array are not monotonic and represent the descrete
-    * derivative of the CDF, or the Probablity Mass Function (PMF). Each returned point represents the fractional
+    * <p>If <i>isCdf</i> is false, the points in the returned array are not monotonic and represent the discrete
+    * derivative of the CDF, or the Probability Mass Function (PMF). Each returned point represents the fractional
     * area of the total distribution which lies between the previous point (or zero) and the given point, which
     * corresponds to the given splitPoint.<p>
     *
diff --cc src/main/java/org/apache/datasketches/GenericSortedView.java
index 7f6b74cd,9ee44034..0e87bbd8
--- a/src/main/java/org/apache/datasketches/GenericSortedView.java
+++ b/src/main/java/org/apache/datasketches/GenericSortedView.java
@@@ -58,23 -58,17 +58,30 @@@ public interface GenericSortedView<T> e
     * area of the total distribution which lies between the previous point (or zero) and the given point, which
     * corresponds to the given splitPoint.<p>
     *
 -   * @param splitPoints the given array of quantile values or splitPoints. This is a sorted, unique, monotonic array
 -   * of values in the range of (minValue, maxValue). This array should not include either the minValue or the maxValue.
 +   * @param splitPoints the given array of quantile items or splitPoints. This is a sorted, unique, monotonic array
 +   * of items in the range of (minValue, maxValue). This array should not include either the minValue or the maxValue.
     * The returned array will have one extra interval representing the very top of the distribution.
     * @param isCdf if true, a CDF will be returned, otherwise, a PMF will be returned.
++<<<<<<< HEAD
 +   * @param searchCrit if INCLUSIVE, each interval within the distribution will include its top item and exclude its
 +   * bottom item. Otherwise, it will be the reverse.  The only exception is that the top portion will always include
 +   * the top item retained by the sketch.
 +   * @return an array of points that correspond to the given splitPoints, and represents the data distributio
++=======
+    * @param searchCrit if INCLUSIVE, each interval within the distribution will include its top value and exclude its
+    * bottom value. Otherwise, it will be the reverse.  The only exception is that the top portion will always include
+    * the top value retained by the sketch.
+    * @return an array of points that correspond to the given splitPoints, and represents the data distribution
++>>>>>>> refs/heads/master
     * as a CDF or PMF.
     */
 -  double[] getPmfOfCdf(T[] splitPoints, boolean isCdf, QuantileSearchCriteria searchCrit);
 +  double[] getPmfOrCdf(T[] splitPoints, boolean isCdf, QuantileSearchCriteria searchCrit);
 +
 +  /**
 +   * Returns the array of items.
 +   * @return the array of items.
 +   */
 +  T[] getItems();
  
    @Override
    GenericSortedViewIterator<T> iterator();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org