Merge pull request #7 from adrianliaw/namespace

Use formula namespace

Author: adrianliaw

pycuber/__init__.py

@@ -1,7 +1,7 @@
-from .cube import Cube, Cubie, Centre, Corner, Edge, Square, Step, Algo
+from .cube import Cube, Cubie, Centre, Corner, Edge, Square, Step, Formula
 from .helpers import fill_unknowns, array_to_cubies
 
-__all__ = ["Cube", "Cubie", "Centre", "Corner", "Edge", "Square", "Step", "Algo"]
+__all__ = ["Cube", "Cubie", "Centre", "Corner", "Edge", "Square", "Step", "Formula"]
 __title__ = "PyCuber"
 __version__ = "0.1.4"
 __author__ = "Adrian Liaw"

pycuber/cube.py

@@ -1,4 +1,4 @@
-from .algorithm import *
+from .formula import *
 from .util import FrozenDict
 from functools import reduce
 from itertools import permutations
@@ -519,11 +519,11 @@ def perform_step(self, step):
 
     def perform_algo(self, algo):
         """
-        Perform a Rubik's Cube Algorithm.
+        Perform a Rubik's Cube Formula.
         Using "Singmaster notation".
         """
-        algo = Algo(algo)
-        for step in algo:
+        formula = Formula(algo)
+        for step in formula:
             self.perform_step(step)
         return self