diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin index 9883848b82cb70715ad86a3a6df5414a78ee0208..c46e15bd854f8e4e06bb1f69e356793676d553ff 100644 Binary files a/.gradle/8.10.2/executionHistory/executionHistory.bin and b/.gradle/8.10.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock index 35c1a18cb89651c04eb1af61bfe6b1ab13baa2d6..8f2e2b22a73cbbc959fa8af0ea18b150e32d3fe2 100644 Binary files a/.gradle/8.10.2/executionHistory/executionHistory.lock and b/.gradle/8.10.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin index 1d3da69423c8189fb22245a4f8d5717f3eb5fe2b..29469af9bfec929b3ec262caa5d5dd5f3c1f200c 100644 Binary files a/.gradle/8.10.2/fileHashes/fileHashes.bin and b/.gradle/8.10.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock index 2682636e0144b8905cfc403e550010eb5ff1fa86..b687070073f9e85118e808cb30bf176a52616281 100644 Binary files a/.gradle/8.10.2/fileHashes/fileHashes.lock and b/.gradle/8.10.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin index 6815161183abdf4a645a1be4a7963eeea9022185..b472b2cc413fd0fd118ee8dac74ca66214808905 100644 Binary files a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 57797816a59ffdea6215d7aaaf651826dd514c83..5cee72757e140b9a4d5fc93caf5dfb26900fdc9f 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/model/FFboardFiller.class b/build/classes/java/main/model/FFboardFiller.class index bf81cf59688ca0e6ead59ff7efa1739a918ca915..11c72f5ec52221d0df0e243cf8394242f6bea792 100644 Binary files a/build/classes/java/main/model/FFboardFiller.class and b/build/classes/java/main/model/FFboardFiller.class differ diff --git a/build/classes/java/main/model/Road.class b/build/classes/java/main/model/Road.class index daf2775c54136c16ab148cd29c35c05003a30797..2e08aedd4f1bc69add1182c39883ce9eeed2d03e 100644 Binary files a/build/classes/java/main/model/Road.class and b/build/classes/java/main/model/Road.class differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 8b085a4b3b6c24c3e04d4010f27f51cd399e4834..bcdd475d8fa9ab9d476b27463bf53c14f1b7aa66 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/model/FFboardFiller.java b/src/main/java/model/FFboardFiller.java index d89b9e56f20978ed188346641eb35d664c5160c8..6669df0c950b0919d27eb4d554932e459557dd0d 100644 --- a/src/main/java/model/FFboardFiller.java +++ b/src/main/java/model/FFboardFiller.java @@ -20,9 +20,12 @@ public class FFboardFiller { Element element; Position p; do { - p=new Position(random.nextInt(boardData.getRowCount()), random.nextInt(boardData.getColumnCount())); + p=positions.get(random.nextInt(positions.size())); element= ve.instanciate(boardData,p); - }while (!boardData.addElement(element) && positions.contains(element.getPosition())); + }while (!boardData.addElement(element)); + if (element instanceof ConnexElement) { + positions.removeAll(boardData.getElements().get(element.getType().ordinal()).stream().map(x ->x.getPosition()).toList()); + System.out.println("0");} positions.remove(p); counter[ve.ordinal()]--; } diff --git a/src/main/java/model/Road.java b/src/main/java/model/Road.java index d32acffcf90444b2cc18631c751643cc89a3f7b5..a769a7f01ad56fcd1ffc23924d15fc6353cfaeb0 100644 --- a/src/main/java/model/Road.java +++ b/src/main/java/model/Road.java @@ -11,6 +11,6 @@ public class Road extends Land implements Element,ConnexElement { @Override public ElementFactory getFactory() { - return null; + return factory; } }