From fef0eb447c4dd86966d2eaa1180b28721aa019cc Mon Sep 17 00:00:00 2001 From: adrianliaw Date: Fri, 21 Nov 2014 15:16:10 +0800 Subject: [PATCH] solver package --- pycuber/__init__.py | 2 +- pycuber/solver/__init__.py | 15 +++++++++++++++ pycuber/solver/cfop/oll.py | 4 ++-- pycuber/solver/cfop/pll.py | 4 ++-- setup.py | 7 +++++-- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/pycuber/__init__.py b/pycuber/__init__.py index 7ea46db..44e4474 100644 --- a/pycuber/__init__.py +++ b/pycuber/__init__.py @@ -3,6 +3,6 @@ __all__ = ["Cube", "Cubie", "Centre", "Corner", "Edge", "Square", "Step", "Algo"] __title__ = "PyCuber" -__version__ = "0.1b3" +__version__ = "0.1b4" __author__ = "Adrian Liaw" __license__ = "MIT" diff --git a/pycuber/solver/__init__.py b/pycuber/solver/__init__.py index e69de29..3208cda 100644 --- a/pycuber/solver/__init__.py +++ b/pycuber/solver/__init__.py @@ -0,0 +1,15 @@ +""" +PyCuber solvers can be found here. + +Usage: + >>> import pycuber as pc + >>> from pycuber.solver import CFOPSolver + >>> rand_alg = pc.Algo().random() + >>> cube = pc.Cube() + >>> cube(rand_alg) + >>> solver = CFOPSolver(cube) + >>> solver.solve() + +""" + +from cfop import CFOPSolver diff --git a/pycuber/solver/cfop/oll.py b/pycuber/solver/cfop/oll.py index b30c010..de61a23 100644 --- a/pycuber/solver/cfop/oll.py +++ b/pycuber/solver/cfop/oll.py @@ -2,10 +2,10 @@ Module for solving Rubik's Cube OLL. """ -import csv +import csv, os from pycuber import * -with open("cfop/oll_algos.csv", "r") as f: +with open(os.path.join(os.path.dirname(__file__), "oll_algos.csv"), "r") as f: reader = csv.reader(f, delimiter=",") algo_dict = {} for line in reader: diff --git a/pycuber/solver/cfop/pll.py b/pycuber/solver/cfop/pll.py index 1401027..188d8ce 100644 --- a/pycuber/solver/cfop/pll.py +++ b/pycuber/solver/cfop/pll.py @@ -2,10 +2,10 @@ Module for solving Rubik's Cube PLL. """ -import csv +import csv, os from pycuber import * -with open("cfop/pll_algos.csv", "r") as f: +with open(os.path.join(os.path.dirname(__file__), "pll_algos.csv"), "r") as f: reader = csv.reader(f, delimiter=",") algo_dict = {} for name, rec_id, algo in reader: diff --git a/setup.py b/setup.py index 9ade986..62eead8 100644 --- a/setup.py +++ b/setup.py @@ -55,14 +55,14 @@ setup( name = "pycuber", - version = "0.1b3", + version = "0.1b4", description = "Rubik's Cube in Python", long_description = long_desc, url = "http://github.com/adrianliaw/PyCuber", license = "MIT", author = "Adrian Liaw", author_email = "adrianliaw2000@gmail.com", - packages = ["pycuber"], + packages = ["pycuber", "pycuber.solver", "pycuber.solver.cfop"], package_dir = {"pycuber":"pycuber"}, classifiers = [ "Development Status :: 4 - Beta", @@ -74,4 +74,7 @@ "Programming Language :: Python :: 3", "Topic :: Scientific/Engineering :: Mathematics", ], + package_data = { + "pycuber.solver.cfop": ["*.csv"], + }, )