This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch thetaRework
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/thetaRework by this push:
new a66d3b00c More cleanup
a66d3b00c is described below
commit a66d3b00c453f3d71ad1023455508e15c41ea9b7
Author: Lee Rhodes <lee...@gmail.com>
AuthorDate: Fri Jun 27 10:27:01 2025 -0700
More cleanup
---
pom.xml | 1 +
.../BoundsOnRatiosInThetaSketchedSets2.java | 121 ------------
.../BoundsOnRatiosInTupleSketchedSets2.java | 204 ---------------------
3 files changed, 1 insertion(+), 325 deletions(-)
diff --git a/pom.xml b/pom.xml
index 01d0cc65c..760acd58d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,7 @@ under the License.
</execution>
<execution>
<id>default-report</id>
+ <phase>test</phase>
<goals>
<goal>report</goal>
</goals>
diff --git
a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets2.java
b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets2.java
deleted file mode 100644
index f8199cc4f..000000000
---
a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInThetaSketchedSets2.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.datasketches.thetacommon;
-
-import static org.apache.datasketches.common.Util.LONG_MAX_VALUE_AS_DOUBLE;
-
-import org.apache.datasketches.common.BoundsOnRatiosInSampledSets;
-import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.theta2.Sketch;
-
-/**
- * This class is used to compute the bounds on the estimate of the ratio <i>B
/ A</i>, where:
- * <ul>
- * <li><i>A</i> is a Theta Sketch of population <i>PopA</i>.</li>
- * <li><i>B</i> is a Theta Sketch of population <i>PopB</i> that is a subset
of <i>A</i>,
- * obtained by an intersection of <i>A</i> with some other Theta Sketch
<i>C</i>,
- * which acts like a predicate or selection clause.</li>
- * <li>The estimate of the ratio <i>PopB/PopA</i> is
- * BoundsOnRatiosInThetaSketchedSets.getEstimateOfBoverA(<i>A, B</i>).</li>
- * <li>The Upper Bound estimate on the ratio PopB/PopA is
- * BoundsOnRatiosInThetaSketchedSets.getUpperBoundForBoverA(<i>A, B</i>).</li>
- * <li>The Lower Bound estimate on the ratio PopB/PopA is
- * BoundsOnRatiosInThetaSketchedSets.getLowerBoundForBoverA(<i>A, B</i>).</li>
- * </ul>
- * Note: The theta of <i>A</i> cannot be greater than the theta of <i>B</i>.
- * If <i>B</i> is formed as an intersection of <i>A</i> and some other set
<i>C</i>,
- * then the theta of <i>B</i> is guaranteed to be less than or equal to the
theta of <i>B</i>.
- *
- * @author Kevin Lang
- * @author Lee Rhodes
- */
-public final class BoundsOnRatiosInThetaSketchedSets2 {
-
- private BoundsOnRatiosInThetaSketchedSets2() {}
-
- /**
- * Gets the approximate lower bound for B over A based on a 95% confidence
interval
- * @param sketchA the sketch A
- * @param sketchB the sketch B
- * @return the approximate lower bound for B over A
- */
- public static double getLowerBoundForBoverA(final Sketch sketchA, final
Sketch sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries(true);
- final int countA = (thetaLongB == thetaLongA)
- ? sketchA.getRetainedEntries(true)
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getLowerBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the approximate upper bound for B over A based on a 95% confidence
interval
- * @param sketchA the sketch A
- * @param sketchB the sketch B
- * @return the approximate upper bound for B over A
- */
- public static double getUpperBoundForBoverA(final Sketch sketchA, final
Sketch sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries(true);
- final int countA = (thetaLongB == thetaLongA)
- ? sketchA.getRetainedEntries(true)
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 1.0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getUpperBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the estimate for B over A
- * @param sketchA the sketch A
- * @param sketchB the sketch B
- * @return the estimate for B over A
- */
- public static double getEstimateOfBoverA(final Sketch sketchA, final Sketch
sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries(true);
- final int countA = (thetaLongB == thetaLongA)
- ? sketchA.getRetainedEntries(true)
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0.5; }
-
- return (double) countB / (double) countA;
- }
-
- static void checkThetas(final long thetaLongA, final long thetaLongB) {
- if (thetaLongB > thetaLongA) {
- throw new SketchesArgumentException("ThetaLongB cannot be >
ThetaLongA.");
- }
- }
-}
diff --git
a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets2.java
b/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets2.java
deleted file mode 100644
index ea8a20828..000000000
---
a/src/main/java/org/apache/datasketches/thetacommon/BoundsOnRatiosInTupleSketchedSets2.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.datasketches.thetacommon;
-
-import static org.apache.datasketches.common.Util.LONG_MAX_VALUE_AS_DOUBLE;
-
-import org.apache.datasketches.common.BoundsOnRatiosInSampledSets;
-import org.apache.datasketches.common.SketchesArgumentException;
-import org.apache.datasketches.tuple2.Sketch;
-import org.apache.datasketches.tuple2.Summary;
-
-/**
- * This class is used to compute the bounds on the estimate of the ratio <i>B
/ A</i>, where:
- * <ul>
- * <li><i>A</i> is a Tuple Sketch of population <i>PopA</i>.</li>
- * <li><i>B</i> is a Tuple or Theta Sketch of population <i>PopB</i> that is a
subset of <i>A</i>,
- * obtained by an intersection of <i>A</i> with some other Tuple or Theta
Sketch <i>C</i>,
- * which acts like a predicate or selection clause.</li>
- * <li>The estimate of the ratio <i>PopB/PopA</i> is
- * BoundsOnRatiosInThetaSketchedSets.getEstimateOfBoverA(<i>A, B</i>).</li>
- * <li>The Upper Bound estimate on the ratio PopB/PopA is
- * BoundsOnRatiosInThetaSketchedSets.getUpperBoundForBoverA(<i>A, B</i>).</li>
- * <li>The Lower Bound estimate on the ratio PopB/PopA is
- * BoundsOnRatiosInThetaSketchedSets.getLowerBoundForBoverA(<i>A, B</i>).</li>
- * </ul>
- * Note: The theta of <i>A</i> cannot be greater than the theta of <i>B</i>.
- * If <i>B</i> is formed as an intersection of <i>A</i> and some other set
<i>C</i>,
- * then the theta of <i>B</i> is guaranteed to be less than or equal to the
theta of <i>B</i>.
- *
- * @author Kevin Lang
- * @author Lee Rhodes
- * @author David Cromberge
- */
-public final class BoundsOnRatiosInTupleSketchedSets2 {
-
- private BoundsOnRatiosInTupleSketchedSets2() {}
-
- /**
- * Gets the approximate lower bound for B over A based on a 95% confidence
interval
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Tuple sketch B with summary type <i>S</i>
- * @param <S> Summary
- * @return the approximate lower bound for B over A
- */
- public static <S extends Summary> double getLowerBoundForBoverA(
- final Sketch<S> sketchA,
- final Sketch<S> sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries();
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getLowerBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the approximate lower bound for B over A based on a 95% confidence
interval
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Theta sketch B
- * @param <S> Summary
- * @return the approximate lower bound for B over A
- */
- public static <S extends Summary> double getLowerBoundForBoverA(
- final Sketch<S> sketchA,
- final org.apache.datasketches.theta.Sketch sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries();
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getLowerBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the approximate upper bound for B over A based on a 95% confidence
interval
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Tuple sketch B with summary type <i>S</i>
- * @param <S> Summary
- * @return the approximate upper bound for B over A
- */
- public static <S extends Summary> double getUpperBoundForBoverA(
- final Sketch<S> sketchA,
- final Sketch<S> sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries();
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 1.0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getUpperBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the approximate upper bound for B over A based on a 95% confidence
interval
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Theta sketch B
- * @param <S> Summary
- * @return the approximate upper bound for B over A
- */
- public static <S extends Summary> double getUpperBoundForBoverA(
- final Sketch<S> sketchA,
- final org.apache.datasketches.theta.Sketch sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries(true);
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 1.0; }
- final double f = thetaLongB / LONG_MAX_VALUE_AS_DOUBLE;
- return BoundsOnRatiosInSampledSets.getUpperBoundForBoverA(countA, countB,
f);
- }
-
- /**
- * Gets the estimate for B over A
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Tuple sketch B with summary type <i>S</i>
- * @param <S> Summary
- * @return the estimate for B over A
- */
- public static <S extends Summary> double getEstimateOfBoverA(
- final Sketch<S> sketchA,
- final Sketch<S> sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries();
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0.5; }
-
- return (double) countB / (double) countA;
- }
-
- /**
- * Gets the estimate for B over A
- * @param sketchA the Tuple sketch A with summary type <i>S</i>
- * @param sketchB the Theta sketch B
- * @param <S> Summary
- * @return the estimate for B over A
- */
- public static <S extends Summary> double getEstimateOfBoverA(
- final Sketch<S> sketchA,
- final org.apache.datasketches.theta.Sketch sketchB) {
- final long thetaLongA = sketchA.getThetaLong();
- final long thetaLongB = sketchB.getThetaLong();
- checkThetas(thetaLongA, thetaLongB);
-
- final int countB = sketchB.getRetainedEntries(true);
- final int countA = thetaLongB == thetaLongA
- ? sketchA.getRetainedEntries()
- : sketchA.getCountLessThanThetaLong(thetaLongB);
-
- if (countA <= 0) { return 0.5; }
-
- return (double) countB / (double) countA;
- }
-
- static void checkThetas(final long thetaLongA, final long thetaLongB) {
- if (thetaLongB > thetaLongA) {
- throw new SketchesArgumentException("ThetaLongB cannot be >
ThetaLongA.");
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datasketches.apache.org
For additional commands, e-mail: commits-h...@datasketches.apache.org
