fix putIfFrequent

Author: GreenWizard2015

YASL-Core/src/YASL/AugmentedSketch/CAugmentedSketch.java

@@ -34,11 +34,6 @@ public CAugmentedSketch(int sz, IItemsCounter<T> counter) {
 	}
 
 	private long putToCounter(T item, long count) {
-		if (!_heap.isFull()) {
-			_heap.add(new CasItem<T>(item, count, 0));
-			return count;
-		}
-
 		final long cnt = _counter.put(item, count);
 		if (_heap.lowest().Priority() < cnt) {
 			final CasItem<T> oldMin = _heap.poll();
@@ -57,6 +52,12 @@ public long putIfFrequent(T item, long count) {
 			_heap.update(item);
 			return ratted.Priority();
 		}
+
+		if (!_heap.isFull()) {
+			_heap.add(new CasItem<T>(item, count, 0));
+			return count;
+		}
+
 		return 0;
 	}
 

YASL-Tests/src/Tests/AugmentedSketch/Test_AugmentedSketch.java

@@ -8,6 +8,7 @@
 import YASL.IEstimator;
 import YASL.IItemsCounter;
 import YASL.AugmentedSketch.CAugmentedSketch;
+import YASL.AugmentedSketch.IAugmentedSketch;
 
 public class Test_AugmentedSketch {
 	@Test
@@ -110,4 +111,16 @@ public void counting() {
 		Assert.assertEquals(1 + 5, est.count(123));
 		Assert.assertEquals(1 + 8, est.count(321));
 	}
+
+	@Test
+	public void PIF_IfHeapNotFull() {
+		final IAugmentedSketch<Integer> est = //
+		    new CAugmentedSketch<Integer>( //
+		        new CasTestHeap(1), //
+		        new CasTestCounter() //
+				);
+
+		est.putIfFrequent(123, 1);
+		Assert.assertEquals(1, est.count(123));
+	}
 }