Changeset 103

Timestamp:

03/21/04 13:31:34 (5 years ago)

Author:

ug

Message:

Fix pattern search

Location:

06/devel

Files:

• algosPY.py (modified) (3 diffs)
• patternPY.py (modified) (4 diffs)

06/devel/algosPY.py

@@ -196 +196 @@
         numOfOccurrences = 0
 
+        # print final position:
+
+        # for i in range(19):
+        #     for j in range(19):
+        #         if not (self.finalpos[index*100 + (i/2) + 10*(j/2)] & (1 << (2*(j%2 + 2*(i%2))))): print 'X',
+        #         elif not (self.finalpos[index*100 + (i/2) + 10*(j/2)] & (1 << (2*(j%2 + 2*(i%2))+1))): print 'O',
+        #         else: print '.',
+        #     print
+
         while not index is None:
 
@@ -207 +216 @@
                        
                 pattern = patternList.get(N)
-                for a0 in range(pattern.anchors[0][1], pattern.anchors[1][1]+1):
-                    for a1 in range(pattern.anchors[0][0], pattern.anchors[1][0]+1):
+                # print 'next pattern'
+                # pattern.printPattern()
+                # print
+                for a0 in range(pattern.anchors[0][0], pattern.anchors[1][0]+1):
+                    for a1 in range(pattern.anchors[0][1], pattern.anchors[1][1]+1):
                         matches = 1
+
+                        # print 'a0', a0, 'a1', a1
                                     
                         pIndex = 2*(a1%2) + (a0%2)
-                        patternBits = pattern.bits[pIndex]                                
+                        patternBits = pattern.bits[pIndex]
+
                         pbIndex = 0
                         fpIndex = index*100 + a1/2 + (a0/2)*10
@@ -223 +238 @@
                             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
                                 if (patternBits[pbIndex] & self.finalpos[fpIndex]):
                                     matches = 0

06/devel/patternPY.py

@@ -40 +40 @@
         if self.left != p.left or self.right != p.right or self.top != p.top or self.bottom != p.bottom: return 1
         if self.moveOne != p.moveOne: return 1
-        for i in range(self.sizeX):
+        for i in range(self.sizeX*self.sizeY):
             if self.initialPos[i] != p.initialPos[i]: return 1
         if self.contList != p.contList: return 1
@@ -169 +169 @@
         self.boardsize = boardsize
         self.data = self.patternList()
+
+
         
     def invertColor(self,co):
@@ -249 +251 @@
             pNew.flip = ii
 
-            if not pNew in l: l.append(pNew)
+            if not pNew in l:
+                l.append(pNew)
+                print 'ACCEPTED'
             if pNew == self.pattern: symmetries.append((ii,0))
   
@@ -273 +277 @@
                 pNew1.colorSwitch = 1
 
-                if not self.fixedColor and not pNew1 in lCS: lCS.append(pNew1)
+                if not self.fixedColor and not pNew1 in lCS:
+                    lCS.append(pNew1)
+                    print 'ACCEPTED CS'
                 if pNew1 == self.pattern:
                     if not self.fixedColor: symmetries.append((ii,1))