|
 |
861d3bc |
diff -up src/sage/features/rubiks.py.orig src/sage/features/rubiks.py
|
|
|
861d3bc |
--- src/sage/features/rubiks.py.orig 2020-10-24 11:37:59.000000000 -0600
|
|
|
861d3bc |
+++ src/sage/features/rubiks.py 2020-10-30 16:35:54.828279888 -0600
|
|
|
861d3bc |
@@ -30,7 +30,7 @@ class cu2(Executable):
|
|
|
861d3bc |
sage: isinstance(cu2(), cu2)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "cu2", executable="cu2",
|
|
|
861d3bc |
+ Executable.__init__(self, "cu2", executable="rubiks_cu2",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
@@ -53,7 +53,7 @@ class size222(Executable):
|
|
|
861d3bc |
sage: isinstance(size222(), size222)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "size222", executable="size222",
|
|
|
861d3bc |
+ Executable.__init__(self, "size222", executable="rubiks_size222",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
@@ -76,7 +76,7 @@ class optimal(Executable):
|
|
|
861d3bc |
sage: isinstance(optimal(), optimal)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "optimal", executable="optimal",
|
|
|
861d3bc |
+ Executable.__init__(self, "optimal", executable="rubiks_optimal",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
@@ -99,7 +99,7 @@ class mcube(Executable):
|
|
|
861d3bc |
sage: isinstance(mcube(), mcube)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "mcube", executable="mcube",
|
|
|
861d3bc |
+ Executable.__init__(self, "mcube", executable="rubiks_mcube",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
@@ -122,7 +122,7 @@ class dikcube(Executable):
|
|
|
861d3bc |
sage: isinstance(dikcube(), dikcube)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "dikcube", executable="dikcube",
|
|
|
861d3bc |
+ Executable.__init__(self, "dikcube", executable="rubiks_dikcube",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
@@ -145,7 +145,7 @@ class cubex(Executable):
|
|
|
861d3bc |
sage: isinstance(cubex(), cubex)
|
|
|
861d3bc |
True
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- Executable.__init__(self, "cubex", executable="cubex",
|
|
|
861d3bc |
+ Executable.__init__(self, "cubex", executable="rubiks_cubex",
|
|
|
861d3bc |
spkg="rubiks")
|
|
|
861d3bc |
|
|
|
861d3bc |
|
|
|
861d3bc |
diff -up src/sage/interfaces/rubik.py.orig src/sage/interfaces/rubik.py
|
|
|
861d3bc |
--- src/sage/interfaces/rubik.py.orig 2020-10-24 11:37:59.000000000 -0600
|
|
|
861d3bc |
+++ src/sage/interfaces/rubik.py 2020-10-30 16:37:38.173193027 -0600
|
|
|
861d3bc |
@@ -96,7 +96,7 @@ class OptimalSolver:
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
Interface to Michael Reid's optimal Rubik's Cube solver.
|
|
|
861d3bc |
"""
|
|
|
861d3bc |
- __cmd = "optimal"
|
|
|
861d3bc |
+ __cmd = "rubiks_optimal"
|
|
|
861d3bc |
|
|
|
861d3bc |
def __init__(self, verbose=False, wait=True):
|
|
|
861d3bc |
self.verbose = verbose
|
|
|
861d3bc |
@@ -185,7 +185,7 @@ move_map = {
|
|
|
861d3bc |
|
|
|
861d3bc |
class CubexSolver:
|
|
|
861d3bc |
|
|
|
861d3bc |
- __cmd = "cubex"
|
|
|
861d3bc |
+ __cmd = "rubiks_cubex"
|
|
|
861d3bc |
|
|
|
861d3bc |
def __call__(self, facets):
|
|
|
861d3bc |
return self.solve(facets)
|
|
|
861d3bc |
@@ -238,7 +238,7 @@ class CubexSolver:
|
|
|
861d3bc |
|
|
|
861d3bc |
class DikSolver:
|
|
|
861d3bc |
|
|
|
861d3bc |
- __cmd = "dikcube"
|
|
|
861d3bc |
+ __cmd = "rubiks_dikcube"
|
|
|
861d3bc |
|
|
|
861d3bc |
def __call__(self, facets):
|
|
|
861d3bc |
return self.solve(facets)
|