refactoring II

LP/__init__.py

@@ -1,17 +1,24 @@
 import sys
-if True:
-    sys.path.append(__path__[0])
+if __name__ != '__main__':
+    sys.path.insert(0, __path__[0])
 
-import lib as utils
+import utils
 from LPath import FILES_ALL, FILES_UNSOLVED, FILES_SOLVED
 from LPath import LPath as path
-from RuneSolver import VigenereSolver, AffineSolver, AutokeySolver, SequenceSolver
-from RuneText import Rune, RuneText
-from RuneText import RUNES, alphabet, load_indices
 
-from HeuristicSearch import GuessVigenere, GuessAffine, GuessPattern
-from HeuristicSearch import SearchInterrupt
-from HeuristicLib import Probability
+from Alphabet import RUNES, alphabet
+from Rune import Rune
+from RuneText import RuneText, RuneTextFile
+
+from IOReader import load_indices, longest_no_interrupt
+from IOWriter import IOWriter
+
+from RuneSolver import SequenceSolver, VigenereSolver, AffineSolver, AutokeySolver
+from KeySearch import GuessVigenere, GuessAffine, GuessPattern
+from Probability import Probability
+
 from InterruptDB import InterruptDB
+from InterruptIndices import InterruptIndices
+from InterruptSearch import InterruptSearch
 
 from FailedAttempts import NGramShifter