Gather data
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
package puzzle;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Value;
|
||||
import lombok.experimental.Accessors;
|
||||
import puzzle.Main.PuzzleResult;
|
||||
import java.util.*;
|
||||
import static puzzle.SwedishGenerator.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import static puzzle.SwedishGenerator.H;
|
||||
import static puzzle.SwedishGenerator.Lemma;
|
||||
import static puzzle.SwedishGenerator.Slot;
|
||||
import static puzzle.SwedishGenerator.W;
|
||||
|
||||
/**
|
||||
* ExportFormat.java
|
||||
@@ -29,18 +32,15 @@ public final class ExportFormat {
|
||||
var g = puz.filled().grid();
|
||||
|
||||
// 1) extract "placed" list from all clue digits in the filled grid
|
||||
var placed = new ArrayList<Placed>();
|
||||
var allSlots = puz.swe().extractSlots(g);
|
||||
var clueMap = puz.filled().clueMap();
|
||||
|
||||
for (var s : allSlots) {
|
||||
var word = clueMap.get(s.key());
|
||||
if (word == null) continue;
|
||||
|
||||
var p = extractPlacedFromSlot(s, word);
|
||||
if (p == null) continue;
|
||||
placed.add(p);
|
||||
}
|
||||
var placed = new ArrayList<Placed>();
|
||||
var clueMap = puz.filled().clueMap();
|
||||
puz.swe().forEachSlot(g, (int key, long rs, long cs, int len) -> {
|
||||
var word = clueMap.get(key);
|
||||
if (word != null) {
|
||||
var p = extractPlacedFromSlot(new Slot(key, rs, cs, len), word);
|
||||
if (p != null) placed.add(p);
|
||||
}
|
||||
});
|
||||
|
||||
// If nothing placed: return full grid mapped to letters/# only
|
||||
if (placed.isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user