This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch ReqExperiment in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
commit c12bc9daec82ab1a8889cd9f476418703b62e000 Author: Lee Rhodes <[email protected]> AuthorDate: Sun Jan 10 14:25:35 2021 -0800 Fix conflicts with master --- src/main/java/org/apache/datasketches/req/ReqSketch.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/datasketches/req/ReqSketch.java b/src/main/java/org/apache/datasketches/req/ReqSketch.java index 18d3aa6..81039ac 100644 --- a/src/main/java/org/apache/datasketches/req/ReqSketch.java +++ b/src/main/java/org/apache/datasketches/req/ReqSketch.java @@ -40,16 +40,16 @@ import org.apache.datasketches.memory.Memory; * <li>The algorithm requires no upper bound on the stream length. * Instead, each relative-compactor counts the number of compaction operations performed * so far (via variable state). Initially, the relative-compactor starts with INIT_NUMBER_OF_SECTIONS. - * Each time the number of compactions (variable state) exceeds 2^{numSections - 1}, we double - * numSections. Note that after merging the sketch with another one variable state may not correspond - * to the number of compactions performed at a particular level, however, since the state variable + * Each time the number of compactions (variable state) exceeds 2^{numSections - 1}, we double + * numSections. Note that after merging the sketch with another one variable state may not correspond + * to the number of compactions performed at a particular level, however, since the state variable * never exceeds the number of compactions, the guarantees of the sketch remain valid.</li> * * <li>The size of each section (variable k and sectionSize in the code and parameter k in * the paper) is initialized with a value set by the user via variable k. * When the number of sections doubles, we decrease sectionSize by a factor of sqrt(2). * This is applied at each level separately. Thus, when we double the number of sections, the - * nominal compactor size increases by a factor of approx. sqrt(2) (+- rounding).</li> + * nominal compactor size increases by a factor of approx. sqrt(2) (+/- rounding).</li> * * <li>The merge operation here does not perform "special compactions", which are used in the paper * to allow for a tight mathematical analysis of the sketch.</li> @@ -215,7 +215,7 @@ public class ReqSketch extends BaseReqSketch { compactors.get(h + 1).getBuffer().mergeSortIn(promoted); retItems += cReturn.deltaRetItems; maxNomSize += cReturn.deltaNomSize; - //if (LAZY_COMPRESSION && retItems < maxNomSize) { break; } + if (LAZY_COMPRESSION && retItems < maxNomSize) { break; } } } aux = null; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
