removed prototype from iterator constructor

Author: lfoscari

src/it/unimi/dsi/webgraph/labelling/ScatteredLabelledArcsASCIIGraph.java

@@ -655,17 +655,17 @@ public ScatteredLabelledArcsASCIIGraph(final Iterator<long[]> arcs, final Long2I
 
 		int j;
 		int[] source = new int[batchSize], target = new int[batchSize];
-		long[] labelStart = new long[batchSize];
+		long[] start = new long[batchSize];
 		FastByteArrayOutputStream fbos = new FastByteArrayOutputStream();
 		OutputBitStream obs = new OutputBitStream(fbos);
-		Label prototype = null;
 		final ObjectArrayList<File> batches = new ObjectArrayList<>(), labelBatches = new ObjectArrayList<>();
 
 		if (pl != null) {
 			pl.itemsName = "labelled arcs";
 			pl.start("Creating sorted batches...");
 		}
 
+		Label l = null;
 		j = 0;
 		long pairs = 0; // Number of pairs
 		while (arcs.hasNext()) {
@@ -681,19 +681,18 @@ public ScatteredLabelledArcsASCIIGraph(final Iterator<long[]> arcs, final Long2I
 				throw new IllegalArgumentException("Not enough labels");
 			}
 
-			Label l = arcLabels.next();
-			prototype = prototype == null ? l : prototype;
+			l = arcLabels.next();
 
 			if (s != t || !noLoops) {
 				source[j] = s;
 				target[j] = t;
-				labelStart[j] = obs.writtenBits();
+				start[j] = obs.writtenBits();
 				l.toBitStream(obs, s);
 				j++;
 
 				if (j == batchSize) {
 					obs.flush();
-					pairs += processTransposeBatch(batchSize, source, target, labelStart, new InputBitStream(fbos.array), tempDir, batches, labelBatches, prototype, labelMergeStrategy);
+					pairs += processTransposeBatch(batchSize, source, target, start, new InputBitStream(fbos.array), tempDir, batches, labelBatches, l, labelMergeStrategy);
 					fbos = new FastByteArrayOutputStream();
 					obs = new OutputBitStream(fbos);
 					j = 0;
@@ -702,13 +701,13 @@ public ScatteredLabelledArcsASCIIGraph(final Iterator<long[]> arcs, final Long2I
 				if (symmetrize && s != t) {
 					source[j] = t;
 					target[j] = s;
-					labelStart[j] = obs.writtenBits();
+					start[j] = obs.writtenBits();
 					l.toBitStream(obs, t);
 					j++;
 
 					if (j == batchSize) {
 						obs.flush();
-						pairs += processTransposeBatch(batchSize, source, target, labelStart, new InputBitStream(fbos.array), tempDir, batches, labelBatches, prototype, labelMergeStrategy);
+						pairs += processTransposeBatch(batchSize, source, target, start, new InputBitStream(fbos.array), tempDir, batches, labelBatches, l, labelMergeStrategy);
 						fbos = new FastByteArrayOutputStream();
 						obs = new OutputBitStream(fbos);
 						j = 0;
@@ -725,7 +724,7 @@ public ScatteredLabelledArcsASCIIGraph(final Iterator<long[]> arcs, final Long2I
 
 		if (j != 0) {
 			obs.flush();
-			pairs += processTransposeBatch(j, source, target, labelStart, new InputBitStream(fbos.array), tempDir, batches, labelBatches, prototype, labelMergeStrategy);
+			pairs += processTransposeBatch(j, source, target, start, new InputBitStream(fbos.array), tempDir, batches, labelBatches, l, labelMergeStrategy);
 		}
 
 		if (pl != null) {
@@ -736,13 +735,13 @@ public ScatteredLabelledArcsASCIIGraph(final Iterator<long[]> arcs, final Long2I
 		numNodes = function == null ? (int)map.size() : function.size();
 		source = null;
 		target = null;
-		labelStart = null;
+		start = null;
 
 		if (function == null) {
 			ids = map.getIds(tempDir);
 		}
 
-		this.arcLabelledBatchGraph = new Transform.ArcLabelledBatchGraph(function == null ? numNodes : n, pairs, batches, labelBatches, prototype, labelMergeStrategy);
+		this.arcLabelledBatchGraph = new Transform.ArcLabelledBatchGraph(function == null ? numNodes : n, pairs, batches, labelBatches, l, labelMergeStrategy);
 	}
 
 	protected static void logBatches(final ObjectArrayList<File> batches, final long pairs, final ProgressLogger pl) {