misc

Author: GreenWizard2015

src/Tests/Test_KTopCollector.java

@@ -51,11 +51,12 @@ public void loading() throws Exception {
 		collectorA.store(new CtosInteger(stream));
 
 		final IEstimationCollector<Integer> collectorB = (new StoredKTop<Integer>( //
+		    3 //
+		)).load( //
 		    new CtisInteger( //
 		        new ByteArrayInputStream(stream.toByteArray()) //
-				), //
-		    3 //
-		)).load();
+				) //
+		);
 
 		Assert.assertEquals( //
 		    collectorA.collect().toString(), //

src/Tests/Test_csTable.java

@@ -25,11 +25,12 @@ public void loadIntTable() throws IOException {
 		tableA.store(new DataOutputStream(stream));
 
 		CcsTable tableB = (new CcsStoredTable( //
+		    2, 1 //
+		)).asInt( //
 		    new DataInputStream( //
 		        new ByteArrayInputStream(stream.toByteArray()) //
-				), //
-		    2, 1 //
-		)).asInt();
+				) //
+		);
 
 		Assert.assertEquals(tableA.read(0, 0), tableB.read(0, 0));
 		Assert.assertEquals(tableA.read(1, 0), tableB.read(1, 0));

src/YASL/Collectors/StoredKTop.java

@@ -7,27 +7,24 @@
 import java.util.Map;
 
 import YASL.CEstimationFor;
-import YASL.IEstimationCollector;
 import YASL.Streams.TypedInputStream;
 
 public class StoredKTop<T> {
-	private final TypedInputStream<T>	_stream;
-	private final int									_size;
+	private final int _size;
 
-	public StoredKTop(TypedInputStream<T> _stream, int _size) {
-		this._stream = _stream;
+	public StoredKTop(int _size) {
 		this._size = _size;
 	}
 
-	public IEstimationCollector<T> load() throws IOException {
-		final int cnt = _stream.readInt();
+	public KTopCollector<T> load(TypedInputStream<T> stream) throws IOException {
+		final int cnt = stream.readInt();
 		final List<CEstimationFor<T>> items = new ArrayList<>(cnt);
 		final Map<T, CEstimationFor<T>> byValue = new HashMap<>();
 
 		for (int i = 0; i < cnt; i++) {
-			final T item = _stream.readType();
-			final long itemCount = _stream.readLong();
-			final CEstimationFor<T> est= new CEstimationFor<>(item, itemCount);
+			final T item = stream.readType();
+			final long itemCount = stream.readLong();
+			final CEstimationFor<T> est = new CEstimationFor<>(item, itemCount);
 
 			items.add(est);
 			byValue.put(item, est);

src/YASL/Counters/Tables/CcsStoredTable.java

@@ -4,21 +4,19 @@
 import java.io.IOException;
 
 public class CcsStoredTable {
-	private final DataInput	_stream;
 	private final int				_width;
 	private final int				_depth;
 
-	public CcsStoredTable(DataInput _stream, int _width, int _depth) {
-		this._stream = _stream;
+	public CcsStoredTable(int _width, int _depth) {
 		this._width = _width;
 		this._depth = _depth;
 	}
 
-	public CcsIntTable asInt() throws IOException {
+	public CcsIntTable asInt(DataInput stream) throws IOException {
 		final int[][] data = new int[_depth][_width];
 		for (int depth = 0; depth < _depth; depth++) {
 			for (int cell = 0; cell < _width; cell++) {
-				data[depth][cell] = _stream.readInt();
+				data[depth][cell] = stream.readInt();
 			}
 		}