Changeset 102

Timestamp:

03/20/04 23:55:39 (5 years ago)

Author:

ug

Message:

Various changes in class Pattern

Location:

06/devel

Files:

• algosPY.py (modified) (4 diffs)
• kombilo.py (modified) (5 diffs)
• patternPY.py (modified) (6 diffs)

06/devel/algosPY.py

@@ -193 +193 @@
             return
 
+        numOfMatches = 0
+        numOfOccurrences = 0
+
         while not index is None:
 
@@ -204 +207 @@
                        
                 pattern = patternList.get(N)
-                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):
+                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):
                         matches = 1
                                     
@@ -220 +223 @@
                             for y in range(length):
                                 pbIndex += 1
-                                if (patternBits[pbIndex] &
-                                    self.finalpos[fpIndex]):
+                                if (patternBits[pbIndex] & self.finalpos[fpIndex]):
                                     matches = 0
                                     break
@@ -232 +234 @@
 
             
-            if matchList: db.makeCurrentCandidate(matchList)
+            if matchList:
+                db.makeCurrentCandidate(matchList)
+                numOfMatches += 1
+                numOfOccurrences += len(matchList)
             else: db.discardCurrent()
 
             index = db.next()
 
+        print numOfMatches, numOfOccurrences
 
 # in x-coord:

06/devel/kombilo.py

@@ -1861 +1861 @@
         if self.currentInitialPattern:
             d = []
-            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):
+            for j in range(self.sel[0][1], self.sel[1][1]+1):
+                for i in range(self.sel[0][0], self.sel[1][0]+1):
                     d.append(self.currentInitialPattern[i+self.boardsize*j])
         else:
@@ -1870 +1870 @@
             cls.append(chr(c[0]-self.sel[0][0]) + chr(c[1]-self.sel[0][1]) + c[2] + '/')
         contListString = join(cls, '')
-        self.currentSearchPattern = Pattern(anchors[0][0], anchors[0][1], anchors[1][0], anchors[1][1],
+        print 'SEARCH', join(d, '')
+        self.currentSearchPattern = Pattern(anchors[0][0], anchors[1][0], anchors[0][1], anchors[1][1],
                                             self.sel[1][0]-self.sel[0][0]+1, self.sel[1][1]-self.sel[0][1]+1,
                                             join(d, ''), contListString, len(self.currentContList), self.moveOne)
@@ -2479 +2480 @@
         d = []
 
-        for i in range(region[0][0], region[1][0]+1):
-            for j in range(region[0][1], region[1][1]+1):
+        for j in range(region[0][1], region[1][1]+1):
+            for i in range(region[0][0], region[1][0]+1):
                 if self.board.wildcards.has_key((i,j)):
                     d.append(wildcolor_to_char(self.board.wildcards[(i,j)]))
@@ -2492 +2493 @@
 
     def getAnchors(self):
+        print 'ANCHORS'
+        print self.sel
         if self.sel[0] == (0,0) or \
            (self.sel[0][0], self.sel[1][1]) == (0,self.boardsize-1) or \
@@ -2516 +2519 @@
                                 self.boardsize-2 -self.sel[1][1]+self.sel[0][1])]
         anchors.sort() # FIXME: is this necessary?
+        print anchors
         return anchors
 

06/devel/patternPY.py

@@ -64 +64 @@
         
 
+    def printPattern(self):
+        d = []
+        for j in range(self.sizeY):
+            for i in range(self.sizeX):
+                d.append(self.initialPos[i+j*self.sizeX])
+            d.append('\n')
+        print join(d, '')
+        print 'anchors', self.anchors
+
+        
     def getBits(self, b, i):
         return self.bits[b][i]
@@ -88 +98 @@
 
         self.initialPos = initialPos
-
         helpFinalPos = list(initialPos)
 
@@ -135 +144 @@
                 self.bits.append(nextBlock)
 
+        self.printPattern()
 
     flips = []
@@ -206 +216 @@
                     newPd[f(i,j, self.pattern.sizeX-1, self.pattern.sizeY-1)] = self.pattern.getInitial(i, j)
 
-            print newPd
             cl = self.pattern.contList.split('/')
             for c in cl:
@@ -229 +238 @@
 
             npdl = []
-            for i in range(newSizeX):
-                for j in range(newSizeY):
+
+            for j in range(newSizeY):
+                for i in range(newSizeX):
                     npdl.append(newPd[(i,j)])
             newPdString = join(npdl, '')
                               
-            pNew = Pattern(newAnchors[0][0], newAnchors[0][1], newAnchors[1][0], newAnchors[1][1],
+            pNew = Pattern(newAnchors[0][0], newAnchors[1][0], newAnchors[0][1], newAnchors[1][1],
                            newSizeX, newSizeY,
                            newPdString, newContList, self.pattern.lenContList, self.pattern.moveOne)
@@ -249 +259 @@
                                       = self.invertColor(self.pattern.getInitial(i, j))
                 npdl = []
-                for i in range(newSizeX):
-                    for j in range(newSizeY):
-                        npdl.append(newPd[(i,j)])
+
+                for j in range(newSizeY):
+                    for i in range(newSizeX):
+                        npdl.append(newPd1[(i,j)])
                 newPd1String = join(npdl, '')
                         
                 newContList1 = join([t[0]+t[1]+self.invertColor(t[2])+'/' for t in ncl], '')
                 
-                pNew1 = Pattern(newAnchors[0][0], newAnchors[0][1], newAnchors[1][0], newAnchors[1][1],
+                pNew1 = Pattern(newAnchors[0][0], newAnchors[1][0], newAnchors[0][1], newAnchors[1][1],
                                 newSizeX, newSizeY,
                                 newPd1String, newContList1, self.pattern.lenContList, self.pattern.moveTwo)