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
The following commit(s) were added to refs/heads/Changes_to_Classic_Quantiles
by this push:
new cf919fdc Correction to conflict.
cf919fdc is described below
commit cf919fdcd5c0a103de30e3b146ccda1f66a38fc1
Author: Lee Rhodes <[email protected]>
AuthorDate: Tue Aug 16 13:09:34 2022 -0700
Correction to conflict.
---
src/main/java/org/apache/datasketches/GenericSortedView.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/GenericSortedView.java
b/src/main/java/org/apache/datasketches/GenericSortedView.java
index 0e87bbd8..f152fe56 100644
--- a/src/main/java/org/apache/datasketches/GenericSortedView.java
+++ b/src/main/java/org/apache/datasketches/GenericSortedView.java
@@ -50,8 +50,8 @@ public interface GenericSortedView<T> extends SortedView {
* <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 discrete
* derivative of the CDF, or the Probability Mass Function (PMF). Each
returned point represents the fractional
@@ -62,17 +62,10 @@ public interface GenericSortedView<T> extends SortedView {
* 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[] getPmfOrCdf(T[] splitPoints, boolean isCdf, QuantileSearchCriteria
searchCrit);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
