You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2022/01/29 23:22:09 UTC
[datasketches-java] 01/05: Spelling and make easier to read.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch FixKllComments
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit e987874c2ceb4e90914003440d88ee62f2dabe69
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Jan 25 12:24:18 2022 -0800
Spelling and make easier to read.
No code changes.
---
.../org/apache/datasketches/QuantilesHelper.java | 2 +-
.../kll/KllFloatsQuantileCalculator.java | 31 +++++++++++++++-------
.../apache/datasketches/kll/KllFloatsSketch.java | 8 +++---
.../org/apache/datasketches/kll/KllHelper.java | 10 ++++---
.../datasketches/quantiles/DoublesAuxiliary.java | 2 +-
.../datasketches/quantiles/ItemsAuxiliary.java | 2 +-
6 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/QuantilesHelper.java b/src/main/java/org/apache/datasketches/QuantilesHelper.java
index 71a3afa..985f8fa 100644
--- a/src/main/java/org/apache/datasketches/QuantilesHelper.java
+++ b/src/main/java/org/apache/datasketches/QuantilesHelper.java
@@ -54,7 +54,7 @@ public class QuantilesHelper {
/**
* This is written in terms of a plain array to facilitate testing.
- * @param wtArr the cumlative weights array consisting of chunks
+ * @param wtArr the cumulative weights array consisting of chunks
* @param pos the position
* @return the index of the chunk containing the position
*/
diff --git a/src/main/java/org/apache/datasketches/kll/KllFloatsQuantileCalculator.java b/src/main/java/org/apache/datasketches/kll/KllFloatsQuantileCalculator.java
index 2ff782c..c0fdf06 100644
--- a/src/main/java/org/apache/datasketches/kll/KllFloatsQuantileCalculator.java
+++ b/src/main/java/org/apache/datasketches/kll/KllFloatsQuantileCalculator.java
@@ -104,9 +104,10 @@ final class KllFloatsQuantileCalculator {
blockyTandemMergeSortRecursion(itemsTmp, weightsTmp, items, weights, levels, 0, numLevels);
}
- private static void blockyTandemMergeSortRecursion(final float[] itemsSrc, final long[] weightsSrc,
- final float[] itemsDst, final long[] weightsDst, final int[] levels, final int startingLevel,
- final int numLevels) {
+ private static void blockyTandemMergeSortRecursion(
+ final float[] itemsSrc, final long[] weightsSrc,
+ final float[] itemsDst, final long[] weightsDst,
+ final int[] levels, final int startingLevel, final int numLevels) {
if (numLevels == 1) { return; }
final int numLevels1 = numLevels / 2;
final int numLevels2 = numLevels - numLevels1;
@@ -115,17 +116,27 @@ final class KllFloatsQuantileCalculator {
final int startingLevel1 = startingLevel;
final int startingLevel2 = startingLevel + numLevels1;
// swap roles of src and dst
- blockyTandemMergeSortRecursion(itemsDst, weightsDst, itemsSrc, weightsSrc, levels,
- startingLevel1, numLevels1);
- blockyTandemMergeSortRecursion(itemsDst, weightsDst, itemsSrc, weightsSrc, levels,
- startingLevel2, numLevels2);
- tandemMerge(itemsSrc, weightsSrc, itemsDst, weightsDst, levels, startingLevel1, numLevels1,
+ blockyTandemMergeSortRecursion(
+ itemsDst, weightsDst,
+ itemsSrc, weightsSrc,
+ levels, startingLevel1, numLevels1);
+ blockyTandemMergeSortRecursion(
+ itemsDst, weightsDst,
+ itemsSrc, weightsSrc,
+ levels, startingLevel2, numLevels2);
+ tandemMerge(
+ itemsSrc, weightsSrc,
+ itemsDst, weightsDst,
+ levels,
+ startingLevel1, numLevels1,
startingLevel2, numLevels2);
}
- private static void tandemMerge(final float[] itemsSrc, final long[] weightsSrc,
+ private static void tandemMerge(
+ final float[] itemsSrc, final long[] weightsSrc,
final float[] itemsDst, final long[] weightsDst,
- final int[] levelStarts, final int startingLevel1, final int numLevels1,
+ final int[] levelStarts,
+ final int startingLevel1, final int numLevels1,
final int startingLevel2, final int numLevels2) {
final int fromIndex1 = levelStarts[startingLevel1];
final int toIndex1 = levelStarts[startingLevel1 + numLevels1]; // exclusive
diff --git a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
index 33098eb..693a4fb 100644
--- a/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
+++ b/src/main/java/org/apache/datasketches/kll/KllFloatsSketch.java
@@ -251,7 +251,7 @@ public class KllFloatsSketch {
private float maxValue_;
private final boolean compatible; //compatible with quantiles sketch
private static final Random random = new Random();
-
+
/**
* Heap constructor with the default <em>k = 200</em>, which has a rank error of about 1.65%.
*/
@@ -300,7 +300,7 @@ public class KllFloatsSketch {
/**
* Off-heap constructor.
- * @param mem Memory object that contains data serilized by this sketch.
+ * @param mem Memory object that contains data serialized by this sketch.
*/
private KllFloatsSketch(final Memory mem) {
m_ = DEFAULT_M;
@@ -1009,7 +1009,9 @@ public class KllFloatsSketch {
KllHelper.randomlyHalveUp(items_, adjBeg, adjPop, random);
} else {
KllHelper.randomlyHalveDown(items_, adjBeg, adjPop, random);
- KllHelper.mergeSortedArrays(items_, adjBeg, halfAdjPop, items_, rawLim, popAbove,
+ KllHelper.mergeSortedArrays(
+ items_, adjBeg, halfAdjPop,
+ items_, rawLim, popAbove,
items_, adjBeg + halfAdjPop);
}
levels_[level + 1] -= halfAdjPop; // adjust boundaries of the level above
diff --git a/src/main/java/org/apache/datasketches/kll/KllHelper.java b/src/main/java/org/apache/datasketches/kll/KllHelper.java
index 8f322c4..c53e189 100644
--- a/src/main/java/org/apache/datasketches/kll/KllHelper.java
+++ b/src/main/java/org/apache/datasketches/kll/KllHelper.java
@@ -120,9 +120,9 @@ class KllHelper {
* @return the actual capacity of a given level given its depth index.
*/
private static long intCapAuxAux(final long k, final int depth) {
- final long twok = k << 1; // for rounding, we pre-multiply by 2
+ final long twok = k << 1; // for rounding pre-multiply by 2
final long tmp = ((twok << depth) / powersOfThree[depth]);
- final long result = ((tmp + 1) >> 1); // then here we add 1 and divide by 2
+ final long result = ((tmp + 1) >> 1); // add 1 and divide by 2
assert (result <= k);
return result;
}
@@ -147,8 +147,10 @@ class KllHelper {
return total;
}
- static void mergeSortedArrays(final float[] bufA, final int startA, final int lenA,
- final float[] bufB, final int startB, final int lenB, final float[] bufC, final int startC) {
+ static void mergeSortedArrays(
+ final float[] bufA, final int startA, final int lenA,
+ final float[] bufB, final int startB, final int lenB,
+ final float[] bufC, final int startC) {
final int lenC = lenA + lenB;
final int limA = startA + lenA;
final int limB = startB + lenB;
diff --git a/src/main/java/org/apache/datasketches/quantiles/DoublesAuxiliary.java b/src/main/java/org/apache/datasketches/quantiles/DoublesAuxiliary.java
index 06b53b4..40d4d35 100644
--- a/src/main/java/org/apache/datasketches/quantiles/DoublesAuxiliary.java
+++ b/src/main/java/org/apache/datasketches/quantiles/DoublesAuxiliary.java
@@ -84,7 +84,7 @@ final class DoublesAuxiliary {
* item would appear in position 0 ≤ pos < n of a hypothetical sorted
* version of that stream.
*
- * <p>Note that since that since the true stream is unavailable,
+ * <p>Note that since the true stream is unavailable,
* we don't actually answer the question for that stream, but rather for
* a <i>different</i> stream of the same length, that could hypothetically
* be reconstructed from the weighted samples in our sketch.
diff --git a/src/main/java/org/apache/datasketches/quantiles/ItemsAuxiliary.java b/src/main/java/org/apache/datasketches/quantiles/ItemsAuxiliary.java
index 48c9866..9a617d4 100644
--- a/src/main/java/org/apache/datasketches/quantiles/ItemsAuxiliary.java
+++ b/src/main/java/org/apache/datasketches/quantiles/ItemsAuxiliary.java
@@ -39,7 +39,7 @@ final class ItemsAuxiliary<T> {
/**
* Constructs the Auxiliary structure from the ItemsSketch
- * @param qs an Itemsketch
+ * @param qs an ItemsSketch
*/
@SuppressWarnings("unchecked")
ItemsAuxiliary(final ItemsSketch<T> qs) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org