Changeset 125

Timestamp:

03/25/04 21:22:05 (5 years ago)

Author:

ug

Message:

Jump to macth in variations

Location:

06/devel

Files:

• algosPY.py (modified) (2 diffs)
• searchPY.py (modified) (1 diff)

06/devel/algosPY.py

@@ -569 +569 @@
 
                 if movelist[movelistIndex] & BRANCHPOINT:
-                    if movelistIndex > 1 and not movelist[movelistIndex-2] & ENDOFVARIATION:
-                        whereAreWe.extend([0,0])
+                    whereAreWeCopy = copy(whereAreWe)
+                    if movelistIndex < self.posTable[index]+4 or not movelist[movelistIndex-2] & ENDOFVARIATION:
+                        whereAreWeCopy.extend([0,0])
                     self.branchpoints.append((deepcopy(dicts), deepcopy(dictsNO),
                                               deepcopy(contList), deepcopy(contListIndex), counter,
-                                              copy(whereAreWe)))
+                                              whereAreWeCopy))
                     movelistIndex += 2
-                    whereAreWe.append(0)
                     continue
                 elif movelist[movelistIndex] & ENDOFVARIATION:
@@ -589 +589 @@
                                     print whereAreWe
                     dicts, dictsNO, contList, contListIndex, counter, whereAreWe = self.branchpoints.pop()
-                    if movelist[movelistIndex+2] & BRANCHPOINT:
-                        whereAreWe[-2] += 1
-                        whereAreWe[-1] = 0
-                        print 'x', whereAreWe
-                    else:
-                        ...
+                    
+                    whereAreWe[-2] += 1
+                    # assert whereAreWe[-1] == 0
+                        
                     movelistIndex += 2
                     continue

06/devel/searchPY.py

@@ -363 +363 @@
                             for algo in algolist: algo.branchpoint_process()
                             self.branchpoints.append((cursor.currentN, b.copy(), 0))
-
+                            print 'branchpoint'
                         if not cursor.atEnd(): cursor.next()
                         elif self.branchpoints: