Split solve.py->solver.py,driver.py to be the lib & main resp.

Author: krishnangovindraj

sudoku/BUILD

@@ -23,18 +23,18 @@ load("@rules_python//python:python.bzl", "py_binary", "py_test")
 
 
 py_library(
-    name = "solve",
-    srcs = ["solve.py"],
+    name = "solver",
+    srcs = ["solver.py"],
     deps = [
         "@vaticle_typedb_client_python//:client_python",
     ]
 )
 
 py_binary(
-    name = "solver",
-    srcs = ["solve.py"],
+    name = "driver",
+    srcs = ["driver.py"],
     deps = [
-        "solve",
+        "solver",
         "@vaticle_typedb_client_python//:client_python"
     ],
     data = [
@@ -52,7 +52,7 @@ py_test(
     name = "test",
     srcs = ["test.py"],
     deps = [
-        "solve",
+        "solver",
         "@vaticle_typedb_client_python//:client_python"
     ],
     data = [

sudoku/driver.py

@@ -0,0 +1,39 @@
+import timeit
+from sys import argv
+
+from solver import Solver
+from typedb.client import TypeDB
+
+HOST = TypeDB.DEFAULT_ADDRESS
+DATABASE_NAME = "sudoku6x6"
+
+def main():
+    if len(argv) != 2:
+        print("Usage:")
+        print("python3 %s setup:            Loads required schema & data" % argv[0])
+        print("python3 %s <sudoku_file>:    Reads & solves the sudoku in <sudoku_file>" % argv[0])
+        return
+
+    solver = Solver(HOST, DATABASE_NAME)
+    if argv[1] == "setup":
+        solver.setup(force=True)
+        return
+
+    solver.setup()
+    sudoku = solver.read_sudoku(argv[1])
+
+    print("Solving:")
+    print(solver.format_sudoku(sudoku), "\n")
+
+    time_start = timeit.default_timer()
+    solution = solver.solve(sudoku)
+    time_taken_ms = int((timeit.default_timer() - time_start) * 1000 + 1)
+    if solution:
+        print("Found solution in " + str(time_taken_ms) + " ms:")
+        print(solver.format_sudoku(solution))
+    else:
+        print("No solution (took " + str(time_taken_ms) + " ms)")
+
+    solver.cleanup()
+
+if __name__=="__main__": main()

sudoku/solve.py sudoku/solver.pysudoku/solve.py renamed to sudoku/solver.py

@@ -19,15 +19,11 @@
 # under the License.
 #
 
-import timeit
-from sys import argv
+
 from typing import List
 
 from typedb.client import TypeDB, TypeDBOptions, SessionType, TransactionType
 
-HOST = TypeDB.DEFAULT_ADDRESS
-DATABASE_NAME = "sudoku6x6"
-
 class Solver:
     SCHEMA_FILE = "sudoku/sudoku6x6_schema.tql"
     DATA_FILE = "sudoku/sudoku6x6_data.tql"
@@ -107,35 +103,3 @@ def solve(self, sudoku: List[List[int]]):
             return [ [result[0].get("v%d%d"%(i,j)).get_value() for j in range(1,7)] for i in range(1,7) ]
         else:
             return None
-
-
-def main():
-    if len(argv) != 2:
-        print("Usage:")
-        print("python3 %s setup:            Loads required schema & data" % argv[0])
-        print("python3 %s <sudoku_file>:    Reads & solves the sudoku in <sudoku_file>" % argv[0])
-        return
-
-    solver = Solver(HOST, DATABASE_NAME)
-    if argv[1] == "setup":
-        solver.setup(force=True)
-        return
-
-    solver.setup()
-    sudoku = solver.read_sudoku(argv[1])
-
-    print("Solving:")
-    print(solver.format_sudoku(sudoku), "\n")
-
-    time_start = timeit.default_timer()
-    solution = solver.solve(sudoku)
-    time_taken_ms = int((timeit.default_timer() - time_start) * 1000 + 1)
-    if solution:
-        print("Found solution in " + str(time_taken_ms) + " ms:")
-        print(solver.format_sudoku(solution))
-    else:
-        print("No solution (took " + str(time_taken_ms) + " ms)")
-
-    solver.cleanup()
-
-if __name__=="__main__": main()

sudoku/test.py

@@ -24,7 +24,7 @@
 
 from typedb.client import TypeDB
 
-from solve import Solver
+from solver import Solver
 
 
 class Test(unittest.TestCase):