Changeset 174 for 06/devel/algosPY.py

Timestamp:

08/16/06 22:26:22 (2 years ago)

Author:

ug

Message:

Worked some more on pattern.cc ... not done yet, though.

Files:

• 06/devel/algosPY.py (modified) (6 diffs)

06/devel/algosPY.py

@@ -1 +1 @@
 # File: algosPY.py
 
-##   Copyright (C) 2001-5 Ulrich Goertz (u@g0ertz.de)
+##   Copyright (C) 2001-6 Ulrich Goertz (u@g0ertz.de)
 
 ##   This file is part of Kombilo 0.6, a go database program.
@@ -25 +25 @@
 from string import lower, join
 from copy import copy, deepcopy
+
+class AlgoError(Exception): pass
 
 def BW2XO(c):
@@ -269 +271 @@
                                     
                         pIndex = 2*(a1%2) + (a0%2)
-                        patternBits = pattern.bits[pIndex]
 
                         pbIndex = 0
                         fpIndex = index*100 + a1/2 + (a0/2)*10
 
-                        # print 'p', patternBits[0]
-
-                        for x in range(patternBits[0]):
-                            start = patternBits[pbIndex+1]
-                            length = patternBits[pbIndex+2]
+                        for x in range(pattern.getBits(pIndex,0)):
+                            start = pattern.getBits(pIndex, pbIndex+1)
+                            length = pattern.getBits(pIndex, pbIndex+2)
                             # print 's', pbIndex, start, length
                             fpIndex += start
@@ -284 +283 @@
                             for y in range(length):
                                 pbIndex += 1
-                                # print 'pbIndex', pbIndex
-                                # for i in range(2):
-                                #     for j in range(2):
-                                #         if patternBits[pbIndex] & (1 << (2*(j + 2*i))): print 'X',
-                                #         elif patternBits[pbIndex] & (1 << (2*(j + 2*i)+1)): print 'O',
-                                #         else: print '.',
-                                #     print
-                                # print 'compare with', fpIndex
-                                # for i in range(2):
-                                #     for j in range(2):
-                                #         if not (self.finalpos[fpIndex] & (1 << (2*(j%2 + 2*(i%2))))):
-                                #             print 'X',
-                                #         elif not (self.finalpos[fpIndex] & (1 << (2*(j%2 + 2*(i%2))+1))):
-                                #             print 'O',
-                                #         else: print '.', 
-                                #     print
-                                # qprint fpIndex, a0, a1, x, y
-                                if (patternBits[pbIndex] & self.finalpos[fpIndex]):
+                                if (pattern.getBits(pIndex, pbIndex) & self.finalpos[fpIndex]):
                                     matches = 0
                                     break
@@ -666 +648 @@
                                 hit, label, contLabelsIndex, switched =\
                                      patternList.updateContinuations(m[0], x, y, invco,
-                                                                     Xinterv[m], Yinterv[m],
+                                                                     Xinterv[m][0], Xinterv[m][1], 
+                                                                     Yinterv[m][0], Yinterv[m][1],
                                                                      dicts[m]['found'], counter,
-                                                                     continuations, contLabels,
+                                                                     continuations, ''.join(contLabels),
                                                                      contLabelsIndex,
                                                                      db.getCurrentWinner())
@@ -1550 +1533 @@
                         
                         hit, label, contLabelsIndex, switched =\
-                             patternList.updateContinuations(m[0], x+a0, y+a1, co, Xint, Yint,
+                             patternList.updateContinuations(m[0], x+a0, y+a1, co, Xint[0], Xint[1], Yint[0], Yint[1],
                                                              currentUInterv.first(), counter-1,
-                                                             continuations, contLabels, contLabelsIndex,
+                                                             continuations, str(contLabels), contLabelsIndex,
                                                              db.getCurrentWinner())
                     if hit: