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 2021/01/10 02:13:40 UTC
[datasketches-characterization] 01/02: Refactor req in branches and
master
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-characterization.git
commit 5c6e35bd7c11832792cef8b0829dc6aa1052c70c
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sat Jan 9 18:06:20 2021 -0800
Refactor req in branches and master
---
src/main/resources/quantiles/ReqSketchAccuracy2Job.conf | 2 +-
src/main/resources/quantiles/ReqSketchAccuracyJob.conf | 2 +-
src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf | 2 +-
.../quantiles => req}/ReqSketchAccuracyProfile.java | 11 +++++------
.../quantiles => req}/ReqSketchAccuracyProfile2.java | 7 +++----
.../quantiles => req}/ReqSketchSizeSpeedProfile.java | 4 +---
.../java/org/apache/datasketches}/req/package-info.java | 2 +-
7 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/quantiles/ReqSketchAccuracy2Job.conf b/src/main/resources/quantiles/ReqSketchAccuracy2Job.conf
index 22e0753..e6707d2 100644
--- a/src/main/resources/quantiles/ReqSketchAccuracy2Job.conf
+++ b/src/main/resources/quantiles/ReqSketchAccuracy2Job.conf
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-JobProfile=org.apache.datasketches.characterization.quantiles.ReqSketchAccuracyProfile2
+JobProfile=org.apache.datasketches.req.ReqSketchAccuracyProfile2
# Trials config (indep of sketch)
## Stream lengths
diff --git a/src/main/resources/quantiles/ReqSketchAccuracyJob.conf b/src/main/resources/quantiles/ReqSketchAccuracyJob.conf
index f6609a8..2c28438 100644
--- a/src/main/resources/quantiles/ReqSketchAccuracyJob.conf
+++ b/src/main/resources/quantiles/ReqSketchAccuracyJob.conf
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-JobProfile=org.apache.datasketches.characterization.quantiles.ReqSketchAccuracyProfile
+JobProfile=org.apache.datasketches.req.ReqSketchAccuracyProfile
# Stream Pattern
Pattern=Sorted # Sorted, Reversed, Zoomin, Zoomout, Random, Sqrt, FlipFlop
diff --git a/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf b/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
index 5b52f2f..814cd75 100644
--- a/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
+++ b/src/main/resources/quantiles/ReqSketchSizeSpeedJob.conf
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-JobProfile=org.apache.datasketches.characterization.quantiles.ReqSketchSizeSpeedProfile
+JobProfile=org.apache.datasketches.req.ReqSketchSizeSpeedProfile
# Trials config (indep of sketch)
LgMinT=4
diff --git a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile.java b/src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile.java
rename to src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile.java
index b9b5ddd..0c772ed 100644
--- a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.characterization.quantiles;
+package org.apache.datasketches.req;
import static java.lang.Math.round;
-import static org.apache.datasketches.SpacedPoints.expSpaced;
import static org.apache.datasketches.GaussianRanks.GAUSSIANS_3SD;
+import static org.apache.datasketches.SpacedPoints.expSpaced;
import static org.apache.datasketches.Util.evenlySpaced;
import static org.apache.datasketches.Util.pwr2LawNext;
@@ -30,14 +30,13 @@ import org.apache.datasketches.JobProfile;
import org.apache.datasketches.MonotonicPoints;
import org.apache.datasketches.Properties;
import org.apache.datasketches.characterization.Shuffle;
+import org.apache.datasketches.characterization.quantiles.StreamMaker;
import org.apache.datasketches.characterization.quantiles.StreamMaker.Pattern;
+import org.apache.datasketches.characterization.quantiles.TrueRanks;
import org.apache.datasketches.hll.HllSketch;
import org.apache.datasketches.quantiles.DoublesSketch;
import org.apache.datasketches.quantiles.DoublesSketchBuilder;
import org.apache.datasketches.quantiles.UpdateDoublesSketch;
-import org.apache.datasketches.req.ReqDebugImpl;
-import org.apache.datasketches.req.ReqSketch;
-import org.apache.datasketches.req.ReqSketchBuilder;
/**
* @author Lee Rhodes
@@ -238,7 +237,7 @@ public class ReqSketchAccuracyProfile implements JobProfile {
}
//generates PP indices in [startIdx, endIdx] inclusive, inclusive // PV 2020-01-07: using double so that there's enough precision even for large stream lengths
- final double[] temp = evenlySpaced
+ final double[] temp = evenlySpaced
? evenlySpaced(startIdx, endIdx, numPlotPoints)
: expSpaced(startIdx, endIdx, numPlotPoints, exponent, hra);
diff --git a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile2.java b/src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile2.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile2.java
rename to src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile2.java
index 45db6b2..f48c1eb 100644
--- a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchAccuracyProfile2.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchAccuracyProfile2.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.characterization.quantiles;
+package org.apache.datasketches.req;
import static org.apache.datasketches.GaussianRanks.GAUSSIANS_3SD;
import static org.apache.datasketches.Util.evenlySpacedFloats;
@@ -25,13 +25,12 @@ import static org.apache.datasketches.Util.evenlySpacedFloats;
import org.apache.datasketches.Job;
import org.apache.datasketches.JobProfile;
import org.apache.datasketches.Properties;
+import org.apache.datasketches.characterization.quantiles.StreamMaker;
import org.apache.datasketches.characterization.quantiles.StreamMaker.Pattern;
+import org.apache.datasketches.characterization.quantiles.TrueRanks;
import org.apache.datasketches.quantiles.DoublesSketch;
import org.apache.datasketches.quantiles.DoublesSketchBuilder;
import org.apache.datasketches.quantiles.UpdateDoublesSketch;
-import org.apache.datasketches.req.ReqDebugImpl;
-import org.apache.datasketches.req.ReqSketch;
-import org.apache.datasketches.req.ReqSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchSizeSpeedProfile.java b/src/test/java/org/apache/datasketches/req/ReqSketchSizeSpeedProfile.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchSizeSpeedProfile.java
rename to src/test/java/org/apache/datasketches/req/ReqSketchSizeSpeedProfile.java
index 5bc4d42..6836fc1 100644
--- a/src/test/java/org/apache/datasketches/characterization/quantiles/ReqSketchSizeSpeedProfile.java
+++ b/src/test/java/org/apache/datasketches/req/ReqSketchSizeSpeedProfile.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.characterization.quantiles;
+package org.apache.datasketches.req;
import static java.lang.Math.log;
import static java.lang.Math.pow;
@@ -26,8 +26,6 @@ import static org.apache.datasketches.Util.pwr2LawNext;
import org.apache.datasketches.Job;
import org.apache.datasketches.JobProfile;
import org.apache.datasketches.Properties;
-import org.apache.datasketches.req.ReqSketch;
-import org.apache.datasketches.req.ReqSketchBuilder;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/characterization/req/package-info.java b/src/test/java/org/apache/datasketches/req/package-info.java
similarity index 93%
rename from src/main/java/org/apache/datasketches/characterization/req/package-info.java
rename to src/test/java/org/apache/datasketches/req/package-info.java
index b5e8eb7..5904f69 100644
--- a/src/main/java/org/apache/datasketches/characterization/req/package-info.java
+++ b/src/test/java/org/apache/datasketches/req/package-info.java
@@ -21,4 +21,4 @@
* @author Lee Rhodes
*/
-package org.apache.datasketches.characterization.req;
+package org.apache.datasketches.req;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org