Changeset 101

Timestamp:

03/20/04 18:14:04 (5 years ago)

Author:

ug

Message:

Misc. changes (Export position; Pattern, PatternList?)

Files:

• 06/devel/aglPY.py (modified) (2 diffs)
• 06/devel/algosPY.py (modified) (7 diffs)
• 06/devel/kombilo.py (modified) (13 diffs)
• 06/devel/patternPY.py (modified) (9 diffs)
• 06/devel/searchPY.py (modified) (5 diffs)

06/devel/aglPY.py

@@ -22 +22 @@
-
-from searchPY import *
+from patternPY import *
-
-class abstractGameList:
@@ -548 +549 @@
-
-        print nextMoveVar
-
+, self.boardsize
-
-        if contLabels is None:

06/devel/algosPY.py

@@ -20 +20 @@
-##   The GNU GPL is also currently available at
-##   http://www.gnu.org/copyleft/gpl.html
+
+import os
+from array import *
+from string import lower, join
-
-class Algorithm: # virtual
@@ -501 +505 @@
-
-                contList[m] = []
-
-
+
+
+
-
-                contListIndex[m] = 0
@@ -809 +814 @@
-        for i in range(a0,a1+1):
-            for j in range(b0,b1+1):
-data[i-pattern.anchors[0][0]][j-pattern.anchors[0][1]]
+getFinal(i-pattern.anchors[0][0],j-pattern.anchors[0][1])
-                    return
-data[i-pattern.anchors[0][0]][j-pattern.anchors[0][1]]
+getFinal(i-pattern.anchors[0][0],j-pattern.anchors[0][1])
-                    hashkey += hashTable.hash_value[(i,j)]
-                    numOfStones += 1
-data[i-pattern.anchors[0][0]][j-pattern.anchors[0][1]]
+getFinal(i-pattern.anchors[0][0],j-pattern.anchors[0][1])
-                    hashkey -= hashTable.hash_value[(i,j)]
-                    numOfStones += 1
@@ -1330 +1335 @@
-                while i < p.sizeX and not currentUInterv.isEmpty():
-
-data[i][j]
+getFinal(i,j)
-                        Bint = self.getUInterv(moves, moves1, index, i+a0, j+a1, 'X')[1]
-                        if Bint.data: cont.extend([(x,i,j) for x in [z[0] for z in Bint.data]])
-                        Wint = self.getUInterv(moves, moves1, index, i+a0, j+a1, 'O')[1]
-                        if Wint.data: cont.extend([(x,i,j) for x in [z[0] for z in Wint.data]])
-data[i][j]
-data[i][j]
+getFinal(i,j)
+getFinal(i,j)
-                        
-                    else:
-data[i][j]
+getFinal(i,j)
-                        
-                        if typeInt == -1: # nextInt = [0, MAXNOMOVES), so no need to take intersection
@@ -1346 +1351 @@
-                            currentUInterv = UIntervals()
-                        elif typeInt == 1:
-data[i][j]
+getFinal(i,j)
-                                Bi = self.getUInterv(moves, moves1, index, i+a0, j+a1, 'X')[1]
-                                Wi = self.getUInterv(moves, moves1, index, i+a0, j+a1, 'O')[1]
@@ -1373 +1378 @@
-                    if currentUInterv.isEmpty(): break
-                    
-data[i][j]
+getFinal(i,j)
-                        Bint = nextInt
-                    else:
-                        Bint = self.getUInterv(moves, moves1, index, i+a0, j+a1, 'X')[1]
-                    if Bint.data: cont.extend([(x,i,j) for x in [z[0] for z in Bint.data]])
-data[i][j]
+getFinal(i,j)
-                        Wint = nextInt
-                    else:
@@ -1452 +1457 @@
-              ALGO_HASH_FULL_CORNERS: Algo_hash_full_corners,
-              ALGO_INTERVALS: Algo_intervals}
+
+
+# --------------------------------------------------------------------------
+
+class hashTable:
+
+    def __init__(self, noOfGames, filename):
+         self.data = array('l', [0]*(2*130*noOfGames))
+         self.currentCtr = -1
+         self.dataIndex = 0
+         self.filename = filename
+         
+
+    def newCtr(self, ctr):
+        if ctr == self.currentCtr:
+            while self.dataIndex > 0 and self.data[self.dataIndex-1] == ctr:
+                self.dataIndex -= 2
+        self.currentCtr = ctr
+        self.currentCtrL = []
+
+         
+    def append(self, i):
+        
+        ctr = self.currentCtr
+            
+        if i not in self.currentCtrL:
+            if self.dataIndex >= len(self.data)-1:
+                self.data.extend(array('l', [0]*1000))
+            self.data[self.dataIndex] = i
+            self.dataIndex += 1
+            self.data[self.dataIndex] = ctr
+            self.dataIndex += 1
+            self.currentCtrL.append(i)
+
+
+    def swap(self, l, r):
+        help1 = self.data[2*l]
+        help2 = self.data[2*l+1]
+        self.data[2*l] = self.data[2*r]
+        self.data[2*l+1] = self.data[2*r+1]
+        self.data[2*r] = help1
+        self.data[2*r+1] = help2
+
+            
+    def sort(self):
+
+        l = 0
+        r = self.dataIndex/2 - 1
+        stack = [(l, r)]
+
+        while stack:
+            if r > l:
+                if r-l == 1:
+                    if self.data[2*l] > self.data[2*r]:
+                        self.swap(l,r)
+                    l, r = stack.pop()
+                else:
+                    li = [(self.data[2*l], l), (self.data[2*r], r), (self.data[2*((r+l)/2)], (r+l)/2)]
+                    li.sort()
+
+                    self.swap(li[1][1], r)
+                    help1 = self.data[2*r]
+
+                    left = l
+                    right = r-1
+
+                    while 1: 
+                        while self.data[2*left] < help1: left += 1
+                        while self.data[2*right] > help1: right -= 1
+
+                        if right <= left: break
+                            
+                        self.swap(left, right)
+
+                        left += 1
+                        right -= 1
+                            
+                    self.swap(left, r)
+
+                    if left-l > r-left:
+                        stack.append((l, left-1))
+                        l = left+1
+                    else:
+                        stack.append((left+1, r))
+                        r = left-1                    
+            else:
+                l, r = stack.pop()
+
+
+    def sortedOutput(self, path):
+        self.sort()
+
+        dataX = array('l')
+        data1X = array('B')
+
+        currentCode = self.data[0] - 1  # != self.data[0] !
+        currentValues = []
+        
+        for i in xrange(self.dataIndex/2):
+            if self.data[2*i] != currentCode:
+                currentValues.sort()
+                for v in currentValues:
+                    data1X.append(v/256)
+                    data1X.append(v%256)
+                currentValues = []
+                currentCode = self.data[2*i]
+                dataX.append(currentCode)
+                dataX.append(len(data1X))
+
+            currentValues.append(self.data[2*i+1])
+            
+        currentValues.sort()
+        for v in currentValues:
+            data1X.append(v/256)
+            data1X.append(v%256)
+            
+        file = open(os.path.join(path[0], self.filename + 'T' + path[1] + '.db'), 'wb')
+        dataX.tofile(file)
+        file.close()
+        file = open(os.path.join(path[0], self.filename + path[1] + '.db'), 'wb')
+        data1X.tofile(file)
+        file.close()
+            
+
+    hash_value = {
+        ( 0 ,  0 ):  9149491, ( 0 ,  1 ):  4143844, ( 0 ,  2 ):  8452911, 
+        ( 0 ,  3 ):  3100691, ( 0 ,  4 ):  3196613, ( 0 ,  5 ):  7210416, 
+        ( 0 ,  6 ):  6086509, ( 0 ,  7 ):  7957641, ( 0 ,  8 ):  131916, 
+        ( 0 ,  9 ):  6918136, ( 0 ,  10 ):  3016410, ( 0 ,  11 ):  3288711, 
+        ( 0 ,  12 ):  8539380, ( 0 ,  13 ):  758094, ( 0 ,  14 ):  7179238, 
+        ( 0 ,  15 ):  7718041, ( 0 ,  16 ):  5204153, ( 0 ,  17 ):  6711869, 
+        ( 0 ,  18 ):  8411491, ( 1 ,  0 ):  2434388, ( 1 ,  1 ):  1162683, 
+        ( 1 ,  2 ):  927102, ( 1 ,  3 ):  197419, ( 1 ,  4 ):  9435893, 
+        ( 1 ,  5 ):  2149216, ( 1 ,  6 ):  2967038, ( 1 ,  7 ):  5557593, 
+        ( 1 ,  8 ):  4044723, ( 1 ,  9 ):  4077413, ( 1 ,  10 ):  8810194, 
+        ( 1 ,  11 ):  7673830, ( 1 ,  12 ):  1290402, ( 1 ,  13 ):  704914, 
+        ( 1 ,  14 ):  2782252, ( 1 ,  15 ):  6972890, ( 1 ,  16 ):  2649162, 
+        ( 1 ,  17 ):  8444272, ( 1 ,  18 ):  5863711, ( 2 ,  0 ):  8701652, 
+        ( 2 ,  1 ):  9073146, ( 2 ,  2 ):  796709, ( 2 ,  3 ):  3071327, 
+        ( 2 ,  4 ):  81078, ( 2 ,  5 ):  413463, ( 2 ,  6 ):  9899215, 
+        ( 2 ,  7 ):  3900485, ( 2 ,  8 ):  4258038, ( 2 ,  9 ):  9853936, 
+        ( 2 ,  10 ):  5479882, ( 2 ,  11 ):  4613169, ( 2 ,  12 ):  7404562, 
+        ( 2 ,  13 ):  5251570, ( 2 ,  14 ):  1932628, ( 2 ,  15 ):  9394001, 
+        ( 2 ,  16 ):  6022071, ( 2 ,  17 ):  216105, ( 2 ,  18 ):  4278005, 
+        ( 3 ,  0 ):  7136853, ( 3 ,  1 ):  2500566, ( 3 ,  2 ):  4107671,
+        ( 3 ,  3 ):  4081838, ( 3 ,  4 ):  1785699, ( 3 ,  5 ):  1424534, 
+        ( 3 ,  6 ):  3024969, ( 3 ,  7 ):  5734282, ( 3 ,  8 ):  4175470,
+        ( 3 ,  9 ):  9404994, ( 3 ,  10 ):  8430123, ( 3 ,  11 ):  1255451,
+        ( 3 ,  12 ):  5986866, ( 3 ,  13 ):  7055240, ( 3 ,  14 ):  6371620,
+        ( 3 ,  15 ):  9283568, ( 3 ,  16 ):  7313682, ( 3 ,  17 ):  7717289, 
+        ( 3 ,  18 ):  2299204, ( 4 ,  0 ):  6500542, ( 4 ,  1 ):  1976702, 
+        ( 4 ,  2 ):  7553422, ( 4 ,  3 ):  5187929, ( 4 ,  4 ):  3201058, 
+        ( 4 ,  5 ):  2222174, ( 4 ,  6 ):  3817451, ( 4 ,  7 ):  7344416, 
+        ( 4 ,  8 ):  4960530, ( 4 ,  9 ):  6786163, ( 4 ,  10 ):  8006227,
+        ( 4 ,  11 ):  442411, ( 4 ,  12 ):  4688575, ( 4 ,  13 ):  5012537,
+        ( 4 ,  14 ):  3651243, ( 4 ,  15 ):  7062230, ( 4 ,  16 ):  6716660,
+        ( 4 ,  17 ):  4891547, ( 4 ,  18 ):  5702153, ( 5 ,  0 ):  8827952,
+        ( 5 ,  1 ):  7097129, ( 5 ,  2 ):  9410525, ( 5 ,  3 ):  1319909,
+        ( 5 ,  4 ):  6697319, ( 5 ,  5 ):  6008737, ( 5 ,  6 ):  9209372,
+        ( 5 ,  7 ):  1708104, ( 5 ,  8 ):  8930801, ( 5 ,  9 ):  3357765,
+        ( 5 ,  10 ):  4158639, ( 5 ,  11 ):  8563534, ( 5 ,  12 ):  1000997,
+        ( 5 ,  13 ):  4582316, ( 5 ,  14 ):  6276028, ( 5 ,  15 ):  9658685,
+        ( 5 ,  16 ):  4453094, ( 5 ,  17 ):  9081939, ( 5 ,  18 ):  6565077,
+        ( 6 ,  0 ):  3029400, ( 6 ,  1 ):  3036923, ( 6 ,  2 ):  2527385,
+        ( 6 ,  3 ):  3663094, ( 6 ,  4 ):  1261450, ( 6 ,  5 ):  9321901,
+        ( 6 ,  6 ):  4118265, ( 6 ,  7 ):  7506223, ( 6 ,  8 ):  8638174,
+        ( 6 ,  9 ):  1830356, ( 6 ,  10 ):  9269438, ( 6 ,  11 ):  379190,
+        ( 6 ,  12 ):  5190162, ( 6 ,  13 ):  4415341, ( 6 ,  14 ):  455343,
+        ( 6 ,  15 ):  2706427, ( 6 ,  16 ):  374332, ( 6 ,  17 ):  4806453,
+        ( 6 ,  18 ):  3940651, ( 7 ,  0 ):  7845245, ( 7 ,  1 ):  2132422,
+        ( 7 ,  2 ):  313121, ( 7 ,  3 ):  1581806, ( 7 ,  4 ):  4042198,
+        ( 7 ,  5 ):  4890562, ( 7 ,  6 ):  4352418, ( 7 ,  7 ):  5580773,
+        ( 7 ,  8 ):  9938852, ( 7 ,  9 ):  6930891, ( 7 ,  10 ):  8376253,
+        ( 7 ,  11 ):  5737628, ( 7 ,  12 ):  8471297, ( 7 ,  13 ):  1142249,
+        ( 7 ,  14 ):  848865, ( 7 ,  15 ):  883348, ( 7 ,  16 ):  9812485,
+        ( 7 ,  17 ):  5717034, ( 7 ,  18 ):  7432763, ( 8 ,  0 ):  2354745,
+        ( 8 ,  1 ):  4069809, ( 8 ,  2 ):  9707233, ( 8 ,  3 ):  9588944,
+        ( 8 ,  4 ):  3016914, ( 8 ,  5 ):  554095, ( 8 ,  6 ):  1638369,
+        ( 8 ,  7 ):  9162618, ( 8 ,  8 ):  611584, ( 8 ,  9 ):  5407576,
+        ( 8 ,  10 ):  3543495, ( 8 ,  11 ):  640558, ( 8 ,  12 ):  5662155,
+        ( 8 ,  13 ):  3501725, ( 8 ,  14 ):  7560991, ( 8 ,  15 ):  3133362,
+        ( 8 ,  16 ):  9084840, ( 8 ,  17 ):  6812692, ( 8 ,  18 ):  1594571,
+        ( 9 ,  0 ):  9306451, ( 9 ,  1 ):  238482, ( 9 ,  2 ):  609444,
+        ( 9 ,  3 ):  1700604, ( 9 ,  4 ):  3082475, ( 9 ,  5 ):  5804654,
+        ( 9 ,  6 ):  6738079, ( 9 ,  7 ):  2956313, ( 9 ,  8 ):  3546729,
+        ( 9 ,  9 ):  3491719, ( 9 ,  10 ):  1214856, ( 9 ,  11 ):  888594,
+        ( 9 ,  12 ):  4911844, ( 9 ,  13 ):  315409, ( 9 ,  14 ):  983871,
+        ( 9 ,  15 ):  5306260, ( 9 ,  16 ):  7005661, ( 9 ,  17 ):  4089903,
+        ( 9 ,  18 ):  2599372, ( 10 ,  0 ):  7376553, ( 10 ,  1 ):  5249330,
+        ( 10 ,  2 ):  1810656,( 10 ,  3 ):  765893, ( 10 ,  4 ):  2667106, 
+        ( 10 ,  5 ):  7557868, ( 10 ,  6 ):  9214606, ( 10 ,  7 ):  5347135,
+        ( 10 ,  8 ):  6166404, ( 10 ,  9 ):  1400859, ( 10 ,  10 ):  1919455,
+        ( 10 ,  11 ):  8828173, ( 10 ,  12 ):  6251839, ( 10 ,  13 ):  4004673, 
+        ( 10 ,  14 ):  2006377, ( 10 ,  15 ):  9013385, ( 10 ,  16 ):  6847406,
+        ( 10 ,  17 ):  7019454, ( 10 ,  18 ):  1408057, ( 11 ,  0 ):  6063976,
+        ( 11 ,  1 ):  4380230, ( 11 ,  2 ):  8034820, ( 11 ,  3 ):  1813992,
+        ( 11 ,  4 ):  9773930, ( 11 ,  5 ):  2520157, ( 11 ,  6 ):  1124498,
+        ( 11 ,  7 ):  9369992, ( 11 ,  8 ):  1110455, ( 11 ,  9 ):  1395733,
+        ( 11 ,  10 ):  2582409, ( 11 ,  11 ):  1697715, ( 11 ,  12 ):  2368383,
+        ( 11 ,  13 ):  745577, ( 11 ,  14 ):  8857326, ( 11 ,  15 ):  2179278,
+        ( 11 ,  16 ):  4267432, ( 11 ,  17 ):  6892826, ( 11 ,  18 ):  6099809, 
+        ( 12 ,  0 ):  9973299, ( 12 ,  1 ):  5025252, ( 12 ,  2 ):  3632262,
+        ( 12 ,  3 ):  3081860, ( 12 ,  4 ):  2809085, ( 12 ,  5 ):  1683429,
+        ( 12 ,  6 ):  8369333, ( 12 ,  7 ):  7991628, ( 12 ,  8 ):  8365980,
+        ( 12 ,  9 ):  465773, ( 12 ,  10 ):  1820067, ( 12 ,  11 ):  1457115,
+        ( 12 ,  12 ):  2753928, ( 12 ,  13 ):  282741, ( 12 ,  14 ):  8546560,
+        ( 12 ,  15 ):  6233640, ( 12 ,  16 ):  3079605, ( 12 ,  17 ):  4697340,
+        ( 12 ,  18 ):  4846782, ( 13 ,  0 ):  5022954, ( 13 ,  1 ):  9875417,
+        ( 13 ,  2 ):  9168302, ( 13 ,  3 ):  6618946, ( 13 ,  4 ):  6928618,
+        ( 13 ,  5 ):  8503198, ( 13 ,  6 ):  5052403, ( 13 ,  7 ):  2078686,
+        ( 13 ,  8 ):  2995926, ( 13 ,  9 ):  2194938, ( 13 ,  10 ):  820379,
+        ( 13 ,  11 ):  7612996, ( 13 ,  12 ):  1375726, ( 13 ,  13 ):  8614873,
+        ( 13 ,  14 ):  5945335, ( 13 ,  15 ):  4672767, ( 13 ,  16 ):  3036307,
+        ( 13 ,  17 ):  6840821, ( 13 ,  18 ):  3921566, ( 14 ,  0 ):  9316769,
+        ( 14 ,  1 ):  5099779, ( 14 ,  2 ):  1957262, ( 14 ,  3 ):  82550,
+        ( 14 ,  4 ):  8061649, ( 14 ,  5 ):  5685904, ( 14 ,  6 ):  7357125,
+        ( 14 ,  7 ):  3158126, ( 14 ,  8 ):  9681206, ( 14 ,  9 ):  9939320,
+        ( 14 ,  10 ):  1416538, ( 14 ,  11 ):  9680390, ( 14 ,  12 ):  4083051,
+        ( 14 ,  13 ):  1970772, ( 14 ,  14 ):  8454640, ( 14 ,  15 ):  8443104,
+        ( 14 ,  16 ):  4061492, ( 14 ,  17 ):  6778512, ( 14 ,  18 ):  5077238,
+        ( 15 ,  0 ):  5263977, ( 15 ,  1 ):  6837884, ( 15 ,  2 ):  4767983,
+        ( 15 ,  3 ):  1402914, ( 15 ,  4 ):  1063494, ( 15 ,  5 ):  8805596,
+        ( 15 ,  6 ):  2899665, ( 15 ,  7 ):  5717105, ( 15 ,  8 ):  5032108,
+        ( 15 ,  9 ):  7482452, ( 15 ,  10 ):  95784, ( 15 ,  11 ):  6793965,
+        ( 15 ,  12 ):  7138721, ( 15 ,  13 ):  7934664, ( 15 ,  14 ):  6505269,
+        ( 15 ,  15 ):  6678380, ( 15 ,  16 ):  2901608, ( 15 ,  17 ):  5665651,
+        ( 15 ,  18 ):  3599459, ( 16 ,  0 ):  5070383, ( 16 ,  1 ):  1714950,
+        ( 16 ,  2 ):  8047561, ( 16 ,  3 ):  8205607, ( 16 ,  4 ):  67238,
+        ( 16 ,  5 ):  2156761, ( 16 ,  6 ):  5827686, ( 16 ,  7 ):  1391658,
+        ( 16 ,  8 ):  3591582, ( 16 ,  9 ):  7018330, ( 16 ,  10 ):  9232127,
+        ( 16 ,  11 ):  8849431, ( 16 ,  12 ):  820043, ( 16 ,  13 ):  7847325, 
+        ( 16 ,  14 ):  3583231, ( 16 ,  15 ):  2966011, ( 16 ,  16 ):  5159425,
+        ( 16 ,  17 ):  4855713, ( 16 ,  18 ):  1079091, ( 17 ,  0 ):  2870996, 
+        ( 17 ,  1 ):  5867619, ( 17 ,  2 ):  9327733, ( 17 ,  3 ):  4398712,
+        ( 17 ,  4 ):  9371591, ( 17 ,  5 ):  2182067, ( 17 ,  6 ):  2409473,
+        ( 17 ,  7 ):  709735, ( 17 ,  8 ):  4862464, ( 17 ,  9 ):  8833884,
+        ( 17 ,  10 ):  1260720, ( 17 ,  11 ):  37637, ( 17 ,  12 ):  2367746,
+        ( 17 ,  13 ):  8087960, ( 17 ,  14 ):  4198525, ( 17 ,  15 ):  82482, 
+        ( 17 ,  16 ):  4389571, ( 17 ,  17 ):  787391, ( 17 ,  18 ):  8032185,
+        ( 18 ,  0 ):  2095647, ( 18 ,  1 ):  5448853, ( 18 ,  2 ):  850526,
+        ( 18 ,  3 ):  2278124, ( 18 ,  4 ):  6280764, ( 18 ,  5 ):  4617893,
+        ( 18 ,  6 ):  2879123, ( 18 ,  7 ):  806861, ( 18 ,  8 ):  4007840,
+        ( 18 ,  9 ):  9545335, ( 18 ,  10 ):  9072999, ( 18 ,  11 ):  1446181,
+        ( 18 ,  12 ):  7946775, ( 18 ,  13 ):  6118313, ( 18 ,  14 ):  5073149,
+        ( 18 ,  15 ):  8222792, ( 18 ,  16 ):  4448444, ( 18 ,  17 ):  4579004,
+        ( 18 ,  18 ):  5179082
+        }
+        

06/devel/kombilo.py

@@ -63 +63 @@
-from searchPY import *
-from aglPY import *
+from algosPY import *
-
-try:
@@ -1596 +1597 @@
-        for i in range(sel[0][1], sel[1][1]+1):
-            for j in range(sel[0][0], sel[1][0]+1):
-
-
+
+
+
-                else:                                    d[(i-1,j-1)] = 'O'
-                if self.master.board.wildcards.has_key((j,i)):
@@ -1842 +1844 @@
-
-        boardData = self.board.snapshot()
-
+None, None, None) # FIXME, was (
-
-        self.progBar.clear()
@@ -1858 +1860 @@
-
-        if self.currentInitialPattern:
-{}
+[]
-            for i in range(self.sel[0][0], self.sel[1][0]+1):
-                for j in range(self.sel[0][1], self.sel[1][1]+1):
-
-
-
+
-        else:
-            d = self.getPatternFromBoard(self.sel)
-
-
+
+
+
+
+
+
+
+
-        self.continuations = {}
-        self.statistics = {}
@@ -1937 +1943 @@
-        results = [join(l.results, '|%') for l in self.gamelist.DBlist[`self.boardsize`]]
-        cursorSn = [self.cursor, self.cursor.currentGame, self.cursor.currentN.pathToNode()]
-
-
-
-
+
+
+
+
+
+
+
-
-        self.configButtons(NORMAL)
@@ -2468 +2477 @@
-    def getPatternFromBoard(self, region):
-        
-{}
+[]
-
-        for i in range(region[0][0], region[1][0]+1):
-            for j in range(region[0][1], region[1][1]+1):
-                if not self.board.status.has_key((i,j)):  d[(i,j)] = '.'
-                elif self.board.status[(i,j)] == 'black': d[(i,j)] = 'X'
-                else:                                     d[(i,j)] = 'O'
-                if self.board.wildcards.has_key((i,j)):
-
+
+
+
+
+
+
-        return d
-    
@@ -2504 +2515 @@
-            anchors = [(1, 1), (self.boardsize-2 -self.sel[1][0]+self.sel[0][0],
-                                self.boardsize-2 -self.sel[1][1]+self.sel[0][1])]
-
+
-        return anchors
-
@@ -2522 +2533 @@
-            self.board.delMSLabels()
-            self.currentInitialPattern = None
-None
+[]
-
-
@@ -2565 +2576 @@
-        t = []
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        # mark hoshis with ,'s
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        remarks = []
-        nextMove = 'B'
@@ -2604 +2623 @@
-                if not pos: continue
-            
-][pos[1]] in ['. ', ', ']: l[pos[0]][
-][
-][
-][
+*self.boardsize+pos[1]] in ['. ', ', ']: l[pos[0]*self.boardsize+
+*self.boardsize+
+*self.boardsize+
+*self.boardsize+
-                    remarks.append(ii + 'at ' + 'ABCDEFGHJKLMNOPQRST'[pos[1]] + `pos[0]+1` + '\n')
-
@@ -2614 +2633 @@
-        if not exportMode.get():
-            for i in range(self.boardsize):
-
-
-
-
+
+
+
-
-            if n:
@@ -2623 +2641 @@
-                elif nextMove == 'W': remarks.append('White = 1\n')
-        else:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        t.append('\n')
@@ -3955 +3968 @@
-        self.currentSearchPattern = None
-        self.currentInitialPattern = None
-None
+[]
-        self.moveOne = 'B'
-        self.balloonHelp()

06/devel/patternPY.py

@@ -21 +21 @@
-##   http://www.gnu.org/copyleft/gpl.html
-
+from string import join
+from array import *
-
-class Pattern:
@@ -39 +41 @@
-        if self.moveOne != p.moveOne: return 1
-        for i in range(self.sizeX):
-Data[i] != p.initialData
+Pos[i] != p.initialPos
-        if self.contList != p.contList: return 1
-        return 0
@@ -74 +76 @@
-        if self.moveOne == 'X': self.moveTwo = 'O'
-        else: self.moveTwo = 'X'
-
+
+
+
+
+
-        self.anchors = [(left, top), (right, bottom)]
-self.anchors.sort()               # important for __cmp__
+# self.anchors.sort()               # important for __cmp__ (but already sorted ...)
-
-        self.sizeX = sizeX
@@ -84 +90 @@
-
-        helpFinalPos = list(initialPos)
+
-        for t in contList.split('/'):
-
+
+
+
-
-        self.finalPos = join(helpFinalPos, '')
-
- # [(x-start[0], y-start[1], self.BW2XO(co)) for x, y, co in contList]
+
-        self.lenContList = lenContList
-        
@@ -153 +162 @@
-    def invertColor(self,co):
-        try:
-
+, 'B':'W', 'W':'B'
-        except:
-'
+ invertColor', co
-            return co
-
@@ -195 +204 @@
-            for i in range(self.pattern.sizeX):
-                for j in range(self.pattern.sizeY):
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            pNew.flip = ii
-
@@ -208 +246 @@
-                for i in range(self.pattern.sizeX):
-                    for j in range(self.pattern.sizeY):
-
+
+
+
+
+
+
+
-                        
-
-
+
+
+
+
+
-                pNew1.flip = ii
-                pNew1.colorSwitch = 1
@@ -273 +320 @@
-                            winner):
-
-
+, self.boardsize-1, self.boardsize-1
-                                
-
-
+
+
+
+
-        XX = min(XX1, XX2)
-        YY = min(YY1, YY2)
@@ -304 +353 @@
-                    yy += YY
-
-
+, self.boardsize-1, self.boardsize-1
-                                    
-
-
+,self.boardsize-1, self.boardsize-1
+,self.boardsize-1, self.boardsize-1
-
-                    XX = min(XX1, XX2)

06/devel/searchPY.py

@@ -34 +34 @@
-    from abstractBoardPY import *
-
+from patternPY import *
+from algosPY import *
-
-try:
@@ -379 +381 @@
-                    while len(signature2) < 6: signature2 += '??'
-                    signature = signature1 + signature2
-
+, self.boardsize
-
-                    # Now check for duplicates; first in the currently processed database,
@@ -432 +434 @@
-                    siglist.append(signature)
-
-
+ ImportError
-                    messages.insert('end', 'File ' + f +iColl + ': Error computing the Dyer signature.\n')
-                    signature = '????????????'
@@ -577 +579 @@
-
-
-class hashTable:
-
-    def __init__(self, noOfGames, filename):
-         self.data = array('l', [0]*(2*130*noOfGames))
-         self.currentCtr = -1
-         self.dataIndex = 0
-         self.filename = filename
-         
-
-    def newCtr(self, ctr):
-        if ctr == self.currentCtr:
-            while self.dataIndex > 0 and self.data[self.dataIndex-1] == ctr:
-                self.dataIndex -= 2
-        self.currentCtr = ctr
-        self.currentCtrL = []
-
-         
-    def append(self, i):
-        
-        ctr = self.currentCtr
-            
-        if i not in self.currentCtrL:
-            if self.dataIndex >= len(self.data)-1:
-                self.data.extend(array('l', [0]*1000))
-            self.data[self.dataIndex] = i
-            self.dataIndex += 1
-            self.data[self.dataIndex] = ctr
-            self.dataIndex += 1
-            self.currentCtrL.append(i)
-
-
-    def swap(self, l, r):
-        help1 = self.data[2*l]
-        help2 = self.data[2*l+1]
-        self.data[2*l] = self.data[2*r]
-        self.data[2*l+1] = self.data[2*r+1]
-        self.data[2*r] = help1
-        self.data[2*r+1] = help2
-
-            
-    def sort(self):
-
-        l = 0
-        r = self.dataIndex/2 - 1
-        stack = [(l, r)]
-
-        while stack:
-            if r > l:
-                if r-l == 1:
-                    if self.data[2*l] > self.data[2*r]:
-                        self.swap(l,r)
-                    l, r = stack.pop()
-                else:
-                    li = [(self.data[2*l], l), (self.data[2*r], r), (self.data[2*((r+l)/2)], (r+l)/2)]
-                    li.sort()
-
-                    self.swap(li[1][1], r)
-                    help1 = self.data[2*r]
-
-                    left = l
-                    right = r-1
-
-                    while 1: 
-                        while self.data[2*left] < help1: left += 1
-                        while self.data[2*right] > help1: right -= 1
-
-                        if right <= left: break
-                            
-                        self.swap(left, right)
-
-                        left += 1
-                        right -= 1
-                            
-                    self.swap(left, r)
-
-                    if left-l > r-left:
-                        stack.append((l, left-1))
-                        l = left+1
-                    else:
-                        stack.append((left+1, r))
-                        r = left-1                    
-            else:
-                l, r = stack.pop()
-
-
-    def sortedOutput(self, path):
-        self.sort()
-
-        dataX = array('l')
-        data1X = array('B')
-
-        currentCode = self.data[0] - 1  # != self.data[0] !
-        curre