lothar.buchholz/sudoku-verifier-rxjava
0
0
Fork 0
Code Releases Activity

small refinements, still flaky

Browse Source
This commit is contained in:
paul 2020-03-31 23:35:48 +02:00
parent ffe5c8d609
commit 7c7590b6f1
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/reactivestreams/DigitBlockChecker.java
View File

@ -12,12 +12,14 @@ public abstract class DigitBlockChecker extends SubmissionPublisher<Boolean> imp
int currentRow;
int currentColumn;
Flow.Subscription subscription;
Collection<String> digitsProcessed;
@Override
public void onSubscribe(Flow.Subscription subscription) {
currentRow = 1;
currentColumn = 0;
this.subscription = subscription;
digitsProcessed = new HashSet<>();
subscription.request(9*9);
}
@ -32,12 +34,12 @@ public abstract class DigitBlockChecker extends SubmissionPublisher<Boolean> imp
if (currentDigitApplies(currentRow, currentColumn)) {
if (digitsProcessed.contains(digit)) {
submit(false);
close();
subscription.cancel();
}
digitsProcessed.add(digit);
if (digitsProcessed.size() == 9) {
submit(true);
close();
subscription.cancel();
}
}
}
@ -47,7 +49,7 @@ public abstract class DigitBlockChecker extends SubmissionPublisher<Boolean> imp
@Override
public void onError(Throwable throwable) {
System.err.println(throwable.fillInStackTrace());
close();
closeExceptionally(throwable);
}
@Override

36
src/main/java/reactivestreams/SudokuVerifier.java
View File

@ -20,12 +20,12 @@ public class SudokuVerifier implements Flow.Subscriber<Boolean> {
digitPublisher = new SubmissionPublisher<>();
// Setup row and column checking subscribers
IntStream.rangeClosed(1, 9).boxed()
.forEach(i -> rowCheckerAndColumnChecker(digitPublisher, i));
.forEach(i -> rowCheckerAndColumnChecker(i));
// Setup square checking subscribers
IntStream.rangeClosed(1, 3).boxed()
.forEach(squareRow -> {
IntStream.rangeClosed(1, 3).boxed()
.forEach(squareColumn -> subscribeBlockChecker(digitPublisher, new SquareChecker(squareRow, squareColumn)));
.forEach(squareColumn -> squareChecker(squareRow, squareColumn));
});
}
@ -34,26 +34,36 @@ public class SudokuVerifier implements Flow.Subscriber<Boolean> {
digitStream.forEach(digitPublisher::submit);
digitPublisher.close();
// Wait for checking subscribers to finish
while (finished.get() < digitPublisher.getSubscribers().size() && solved.get()) {
try {
Thread.sleep(5);
} catch (InterruptedException ex) {
System.out.println(ex.fillInStackTrace());
}
int subscriberCount = digitPublisher.getSubscribers().size();
while (true) {
if (!(finished.get() < subscriberCount && solved.get())) break;
justAMoment();
}
return solved.get();
}
private void rowCheckerAndColumnChecker(SubmissionPublisher<String> digitPublisher, Integer i) {
subscribeBlockChecker(digitPublisher, new RowChecker(i));
subscribeBlockChecker(digitPublisher, new ColumnChecker(i));
void rowCheckerAndColumnChecker(Integer i) {
subscribeBlockChecker(new RowChecker(i));
subscribeBlockChecker(new ColumnChecker(i));
}
private void subscribeBlockChecker(SubmissionPublisher<String> digitPublisher, DigitBlockChecker blockChecker) {
void squareChecker(Integer squareRow, Integer squareColumn) {
subscribeBlockChecker(new SquareChecker(squareRow, squareColumn));
}
void subscribeBlockChecker(DigitBlockChecker blockChecker) {
digitPublisher.subscribe(blockChecker);
blockChecker.subscribe(this);
}
void justAMoment() {
try {
Thread.sleep(5);
} catch (InterruptedException ex) {
System.out.println(ex.fillInStackTrace());
}
}
@Override
public void onSubscribe(Flow.Subscription subscription) {
subscription.request(1); // 1 Boolean result from the block checker
@ -69,8 +79,8 @@ public class SudokuVerifier implements Flow.Subscriber<Boolean> {
@Override
public void onError(Throwable throwable) {
System.err.println(throwable.fillInStackTrace());
solved.compareAndSet(true, false);
finished.incrementAndGet();
System.exit(1);
}
@Override