This commit is contained in:
@@ -9,12 +9,9 @@ import sudoku.io.ConsoleInterface;
|
|||||||
import sudoku.io.SudokuPrinter;
|
import sudoku.io.SudokuPrinter;
|
||||||
import sudoku.io.SudokuSerializer;
|
import sudoku.io.SudokuSerializer;
|
||||||
import sudoku.solver.RandomSolver;
|
import sudoku.solver.RandomSolver;
|
||||||
import sudoku.solver.Solver;
|
|
||||||
import sudoku.structure.MultiDoku;
|
import sudoku.structure.MultiDoku;
|
||||||
import sudoku.structure.SudokuFactory;
|
import sudoku.structure.SudokuFactory;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
public class Main {
|
public class Main {
|
||||||
public String getGreeting() {
|
public String getGreeting() {
|
||||||
return "Hello World!";
|
return "Hello World!";
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
package sudoku.structure;
|
package sudoku.structure;
|
||||||
|
|
||||||
import sudoku.constraint.BlockConstraint;
|
|
||||||
import sudoku.constraint.Constraint;
|
|
||||||
import sudoku.constraint.IConstraint;
|
|
||||||
import sudoku.io.SudokuPrinter;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import sudoku.constraint.Constraint;
|
||||||
|
import sudoku.constraint.IConstraint;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class Sudoku
|
* @class Sudoku
|
||||||
* @brief Représent un Sudoku
|
* @brief Représent un Sudoku
|
||||||
@@ -309,7 +307,7 @@ public class Sudoku {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasConstraint(Constraint constraint) {
|
public boolean hasConstraint(Constraint constraint) {
|
||||||
return this.constraints.contains(constraint);
|
return this.constraints.contains(constraint.getConstraint());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
package sudoku.solver;
|
package sudoku.solver;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import gui.constants.Symbols;
|
import gui.constants.Symbols;
|
||||||
@@ -10,17 +14,10 @@ import sudoku.structure.MultiDoku;
|
|||||||
import sudoku.structure.Sudoku;
|
import sudoku.structure.Sudoku;
|
||||||
import sudoku.structure.SudokuFactory;
|
import sudoku.structure.SudokuFactory;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
class SolverTest {
|
class SolverTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void solveTest() {
|
void solveTest() {
|
||||||
Random rand = new Random();
|
|
||||||
|
|
||||||
MultiDoku dokuToTest = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
|
MultiDoku dokuToTest = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
|
||||||
MultiDoku dokuResult = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
|
MultiDoku dokuResult = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user