Merge remote-tracking branch 'origin/master'

StartUpNationLabs · Feb 16, 2024 · e9b1393 · e9b1393
2 parents cc2e88d + 1461409
commit e9b1393
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 56 deletions.
diff --git a/get_true_pieces/main.py b/get_true_pieces/main.py
diff --git a/gui/eternitylib/board.py b/gui/eternitylib/board.py
@@ -70,7 +70,6 @@ def read_csv(self, csv: str):
             set(pattern for line in csv.split("\n") if line.strip() for pattern in line.split(","))
         )
 
-
         for i, line in enumerate(csv.split("\n")):
             if line.strip() == "":
                 continue

diff --git a/gui/eternitylib/generation.py b/gui/eternitylib/generation.py
@@ -50,8 +50,3 @@ def shuffle_board(board):
                 piece.append(piece.pop(0))
     np.random.shuffle(board)
     return board
-
-
-board = create_board(size, number_of_symbols)
-print(print_board(board))
-print(format_board(shuffle_board(board)))
diff --git a/get_true_pieces/hint.json → gui/eternitylib/get_true_pieces/hint.json b/get_true_pieces/hint.json → gui/eternitylib/get_true_pieces/hint.json
diff --git a/get_true_pieces/parsed_data.json → ...rnitylib/get_true_pieces/parsed_data.json b/get_true_pieces/parsed_data.json → ...rnitylib/get_true_pieces/parsed_data.json
diff --git a/get_true_pieces/source.txt → gui/eternitylib/get_true_pieces/source.txt b/get_true_pieces/source.txt → gui/eternitylib/get_true_pieces/source.txt
diff --git a/gui/main.py b/gui/main.py
@@ -53,4 +53,10 @@ def generate_board(size: int, pattern_count: int) -> (str, Path, Path):
 if __name__ == "__main__":
     solver = Solver()
     solver.link_solver()
+
+    board = Board()
+    board.generate(10, 22)
+
+    print(solver.solve(board))
+
     # interface.launch(share=True)
diff --git a/gui/solverlib/execution.py b/gui/solverlib/execution.py
@@ -0,0 +1,6 @@
+class Execution:
+    def __init__(self, logs: str):
+        self.logs = logs
+
+    def parse_logs(self):
+        pass
diff --git a/gui/solverlib/solver.py b/gui/solverlib/solver.py
@@ -9,12 +9,19 @@ def __init__(self):
         # exe is in the same dir as this file
         self.exe_path = Path(__file__).parent / "e2solver"
 
-    def link_solver(self, exe_path: Path = Path(__file__).parent.parent.parent / "cmake-build-debug/solver/Solver"):
-        subprocess.run(["ln", "-s", str(exe_path), str(self.exe_path)])
+    def link_solver(self, path: Path = Path(__file__).parent.parent.parent / "cmake-build-debug/solver/Solver"):
+        # If file does not exist, raise an error
+        if not path.exists():
+            raise FileNotFoundError(f"Solver executable not found at {path}")
+
+        if self.exe_path.exists():
+            self.exe_path.unlink()
+
+        self.exe_path.symlink_to(path)
 
     def solve(self, board: Board, timeout: int = 60) -> str:
         # Write the board to a file
-        board_path = Path(__file__).parent / f"board.{board.hash()}.txt"
+        board_path = Path(__file__).parent.parent / f"tmp/board.{board.hash()}.txt"
         board_path.write_text(board.to_csv())
 
         # Run the solver