Rollback to one folder organization

aimacode · Mar 10, 2016 · 8ea6301 · 8ea6301
1 parent 6ae945b
commit 8ea6301
Show file tree

Hide file tree

Showing 46 changed files with 37 additions and 126 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "aimaPy/aima-data"]
-	path = aimaPy/aima-data
-	url = https://github.com/aimacode/aima-data
+[submodule "aima-data"]
+	path = aima-data
+	url = https://github.com/aimacode/aima-data.git
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ before_install:
 install:
   - pip install flake8
   - pip install -r requirements.txt
-  - python setup.py install
 
 script: 
   - py.test

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/aimaPy/agents.ipynb → agents.ipynb b/aimaPy/agents.ipynb → agents.ipynb
diff --git a/aimaPy/agents.py → agents.py b/aimaPy/agents.py → agents.py
@@ -35,10 +35,7 @@
 #
 # Speed control in GUI does not have any effect -- fix it.
 
-if __name__ == "aimaPy.agents":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 import random
 import copy

diff --git a/aimaPy/aima-data → aima-data b/aimaPy/aima-data → aima-data
diff --git a/aimaPy/__init__.py b/aimaPy/__init__.py
diff --git a/aimaPy/planning.py b/aimaPy/planning.py
diff --git a/aimaPy/csp.ipynb → csp.ipynb b/aimaPy/csp.ipynb → csp.ipynb
diff --git a/aimaPy/csp.py → csp.py b/aimaPy/csp.py → csp.py
@@ -1,12 +1,7 @@
 """CSP (Constraint Satisfaction Problems) problems and solvers. (Chapter 6)."""
 
-
-if __name__ == "aimaPy.csp":
-    from . utils import *
-    from . import search
-else:
-    from utils import *
-    import search
+from utils import *
+import search
 
 from collections import defaultdict
 from functools import reduce

diff --git a/aimaPy/games.ipynb → games.ipynb b/aimaPy/games.ipynb → games.ipynb
diff --git a/aimaPy/games.py → games.py b/aimaPy/games.py → games.py
@@ -1,11 +1,7 @@
 """Games, or Adversarial Search. (Chapter 5)
 """
 
-
-if __name__ == "aimaPy.games":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 import random
 

diff --git a/aimaPy/grid.ipynb → grid.ipynb b/aimaPy/grid.ipynb → grid.ipynb
diff --git a/aimaPy/grid.py → grid.py b/aimaPy/grid.py → grid.py
diff --git a/aimaPy/images/IMAGE-CREDITS → images/IMAGE-CREDITS b/aimaPy/images/IMAGE-CREDITS → images/IMAGE-CREDITS
diff --git a/aimaPy/images/dirt.svg → images/dirt.svg b/aimaPy/images/dirt.svg → images/dirt.svg
diff --git a/aimaPy/images/dirt05-icon.jpg → images/dirt05-icon.jpg b/aimaPy/images/dirt05-icon.jpg → images/dirt05-icon.jpg
diff --git a/aimaPy/images/makefile → images/makefile b/aimaPy/images/makefile → images/makefile
diff --git a/aimaPy/images/vacuum-icon.jpg → images/vacuum-icon.jpg b/aimaPy/images/vacuum-icon.jpg → images/vacuum-icon.jpg
diff --git a/aimaPy/images/vacuum.svg → images/vacuum.svg b/aimaPy/images/vacuum.svg → images/vacuum.svg
diff --git a/aimaPy/images/wall-icon.jpg → images/wall-icon.jpg b/aimaPy/images/wall-icon.jpg → images/wall-icon.jpg
diff --git a/aimaPy/learning.ipynb → learning.ipynb b/aimaPy/learning.ipynb → learning.ipynb
diff --git a/aimaPy/learning.py → learning.py b/aimaPy/learning.py → learning.py
@@ -1,9 +1,6 @@
 """Learn to estimate functions from examples. (Chapters 18-20)"""
 
-if __name__ == "aimaPy.learning":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 import copy
 import heapq

diff --git a/aimaPy/logic.ipynb → logic.ipynb b/aimaPy/logic.ipynb → logic.ipynb
diff --git a/aimaPy/logic.py → logic.py b/aimaPy/logic.py → logic.py
@@ -24,12 +24,8 @@
     diff, simp       Symbolic differentiation and simplification
 """
 
-if __name__ == "aimaPy.logic":
-    from . utils import *
-    from . import agents
-else:
-    from utils import *
-    import agents
+from utils import *
+import agents
 
 import itertools
 import re

diff --git a/aimaPy/mdp.ipynb → mdp.ipynb b/aimaPy/mdp.ipynb → mdp.ipynb
diff --git a/aimaPy/mdp.py → mdp.py b/aimaPy/mdp.py → mdp.py
@@ -6,11 +6,7 @@
 dictionary of {state:number} pairs.  We then define the value_iteration
 and policy_iteration algorithms."""
 
-
-if __name__ == "aimaPy.mdp":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 
 class MDP:

diff --git a/aimaPy/nlp.ipynb → nlp.ipynb b/aimaPy/nlp.ipynb → nlp.ipynb
diff --git a/aimaPy/nlp.py → nlp.py b/aimaPy/nlp.py → nlp.py
@@ -3,10 +3,7 @@
 # (Written for the second edition of AIMA; expect some discrepanciecs
 # from the third edition until this gets reviewed.)
 
-if __name__ == "aimaPy.nlp":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 from collections import defaultdict
 

diff --git a/aimaPy/planning.ipynb → planning.ipynb b/aimaPy/planning.ipynb → planning.ipynb
diff --git a/planning.py b/planning.py
@@ -0,0 +1,12 @@
+"""Planning (Chapters 10-11)
+"""
+
+from utils import *
+import agents
+
+import math
+import random
+import sys
+import time
+import bisect
+import string
diff --git a/aimaPy/probability.ipynb → probability.ipynb b/aimaPy/probability.ipynb → probability.ipynb
diff --git a/aimaPy/probability.py → probability.py b/aimaPy/probability.py → probability.py
@@ -1,12 +1,8 @@
 """Probability models. (Chapter 13-15)
 """
 
-if __name__ == "aimaPy.probability":
-    from . utils import *
-    from . logic import extend
-else:
-    from utils import *
-    from logic import extend
+from utils import *
+from logic import extend
 
 import random
 from collections import defaultdict

diff --git a/aimaPy/rl.ipynb → rl.ipynb b/aimaPy/rl.ipynb → rl.ipynb
diff --git a/aimaPy/rl.py → rl.py b/aimaPy/rl.py → rl.py
@@ -1,12 +1,8 @@
 """Reinforcement Learning (Chapter 21)
 """
 
-if __name__ == "aimaPy.rl":
-    from . utils import *
-    from . import agents
-else:
-    from utils import *
-    import agents
+from utils import *
+import agents
 
 
 class PassiveADPAgent(agents.Agent):

diff --git a/aimaPy/search.ipynb → search.ipynb b/aimaPy/search.ipynb → search.ipynb
diff --git a/aimaPy/search.py → search.py b/aimaPy/search.py → search.py
@@ -4,10 +4,7 @@
 then create problem instances and solve them with calls to the various search
 functions."""
 
-if __name__ == "aimaPy.search":
-    from . utils import *
-else:
-    from utils import *
+from utils import *
 
 import math
 import random

diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tests/test_grid.py b/tests/test_grid.py
@@ -1,5 +1,5 @@
 import pytest
-from aimaPy.grid import *
+from grid import *
 
 compare_list = lambda x, y: all([elm_x == y[i] for i, elm_x in enumerate(x)])
 

diff --git a/tests/probability_test.py → tests/test_probability.py b/tests/probability_test.py → tests/test_probability.py
@@ -1,5 +1,5 @@
 import pytest
-from aimaPy.probability import *
+from probability import *
 
 
 def tests():

diff --git a/tests/text_test.py → tests/test_text.py b/tests/text_test.py → tests/test_text.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aimaPy.text import *
+from text import *
 
 from random import choice
 from math import isclose

diff --git a/tests/utils_test.py → tests/test_utils.py b/tests/utils_test.py → tests/test_utils.py
@@ -1,5 +1,5 @@
 import pytest
-from aimaPy.utils import *
+from utils import *
 
 
 def test_struct_initialization():

diff --git a/aimaPy/text.ipynb → text.ipynb b/aimaPy/text.ipynb → text.ipynb
diff --git a/aimaPy/text.py → text.py b/aimaPy/text.py → text.py
@@ -4,14 +4,9 @@
 Then we show a very simple Information Retrieval system, and an example
 working on a tiny sample of Unix manual pages."""
 
-if __name__ == "aimaPy.text":
-    from . utils import *
-    from . learning import CountingProbDist
-    from . import search
-else:
-    from utils import *
-    from learning import CountingProbDist
-    import search
+from utils import *
+from learning import CountingProbDist
+import search
 
 from math import log, exp
 from collections import defaultdict

diff --git a/aimaPy/utils.py → utils.py b/aimaPy/utils.py → utils.py
@@ -6,10 +6,7 @@
 TODO: Priority queues may not belong here -- see treatment in search.py
 """
 
-if __name__ == "aimaPy.utils":
-    from . grid import *
-else:
-    from grid import *
+from grid import *
 
 import operator
 import math