Use atomic integer instead of synchronized locking for counting scans…

… in mapping process

Framework/Plural/PluralCore/src/main/java/org/peakaboo/framework/plural/streams/StreamExecutor.java

@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -21,7 +22,7 @@ public class StreamExecutor<T> extends EventfulEnum<TaskMonitor.Event> implement
 	private StreamExecutor<?> next;
 	private boolean parallel = true;
 
-	private int count = 0;
+	private AtomicInteger count = new AtomicInteger();
 	private int size = -1;
 	private int interval = 100;
 	Optional<T> result = Optional.empty();
@@ -50,9 +51,8 @@ public void setParallel(boolean parallel) {
 	}
 
 	@Override
-	public synchronized boolean test(Object t) {
-		count++;
-		if (count % interval == 0) {
+	public boolean test(Object t) {
+		if (count.incrementAndGet() % interval == 0) {
 			updateListeners(Event.PROGRESS);
 		}
 		return state == State.RUNNING;
@@ -101,7 +101,7 @@ public State getState() {
 
 	@Override
 	public int getCount() {
-		return count;
+		return count.get();
 	}
 
 	@Override

LibPeakaboo/src/main/java/org/peakaboo/mapping/Mapping.java

@@ -81,7 +81,10 @@ public static StreamExecutor<RawMapSet> mapTask(
 		}
 		RawMapSet maps = new RawMapSet(transitionSeries, mapsize, !noncontiguous);
 
-		StreamExecutor<RawMapSet> streamer = new StreamExecutor<>("Applying Filters & Fittings");
+		int count = dataset.getScanData().scanCount();
+		int interval = (int)Math.max(10, Math.ceil(count / 100f));
+
+		StreamExecutor<RawMapSet> streamer = new StreamExecutor<>("Applying Filters & Fittings", interval);
 		streamer.setTask(new Range(0, dataset.getScanData().scanCount()), stream -> {
 
 			long t1 = System.currentTimeMillis();