Reorganize the source under src/dunshire.

diff --git a/makefile b/makefile
index 9f59a36bec439d23ab78cdb1bd24db1b531187af..2ef17ef883fcd4175057c6e1a0481354e44d01d8 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ check:
 
 .PHONY: lint
 lint:
-       pylint --reports=n *.py
+       PYTHONPATH="src/dunshire" pylint --reports=n src/dunshire/*.py
 
 .PHONY: clean
 clean:

diff --git a/src/dunshire/__init__.py b/src/dunshire/__init__.py
new file mode 100644 (file)
index 0000000..55e7968
--- /dev/null
+++ b/src/dunshire/__init__.py
@@ -0,0 +1,14 @@
+"""
+The "user interface" for Dunshire.
+
+Clients are intended to import everything from this module, which in
+turn pulls in everything that they would need to use the library.
+"""
+
+# Needed to construct the cone over which the game takes place.
+from cones import (NonnegativeOrthant,
+                   IceCream,
+                   SymmetricPSD,
+                   CartesianProduct)
+
+from symmetric_linear_game import SymmetricLinearGame

diff --git a/cones.py b/src/dunshire/cones.py
similarity index 100%
rename from cones.py
rename to src/dunshire/cones.py

diff --git a/errors.py b/src/dunshire/errors.py
similarity index 100%
rename from errors.py
rename to src/dunshire/errors.py

diff --git a/matrices.py b/src/dunshire/matrices.py
similarity index 100%
rename from matrices.py
rename to src/dunshire/matrices.py

diff --git a/symmetric_linear_game.py b/src/dunshire/symmetric_linear_game.py
similarity index 100%
rename from symmetric_linear_game.py
rename to src/dunshire/symmetric_linear_game.py

diff --git a/test/suite.py b/test/suite.py
index e66d3add917acf2dfee4b02a96f67c39fc73a3cc..836e0ba0913543364b3d717a23373dfa18764991 100644 (file)
--- a/test/suite.py
+++ b/test/suite.py
@@ -3,7 +3,7 @@ import doctest
 
 # Add '../' to our path.
 from site import addsitedir
-addsitedir('.')
+addsitedir('./src/dunshire')
 import cones
 import matrices
 import symmetric_linear_game