Changeset 138

Timestamp:

04/07/04 20:38:35 (5 years ago)

Author:

ug

Message:

Continued transcoding patternPY.py

Files:

• 06/devel/pattern.cc (modified) (5 diffs)

06/devel/pattern.cc

@@ -546 +546 @@
 
   int xx = Pattern::flipsX(Pattern::PatternInvFlip(data[index].flip), x, y, boardsize-1, boardsize-1);
-  int yy = Pattern::flipsY(Pattern::PatternInvFlip(data[index].flip), x, y, boardsize-1, boardsize-1);
+  int yy = Patern::flipsY(Pattern::PatternInvFlip(data[index].flip), x, y, boardsize-1, boardsize-1);
 
   int XX1 = Pattern::flipsX(Pattern::patternInvFlip(data[index].flip, Xint0, Yint0, boardsize-1, boardsize-1));
@@ -588 +588 @@
         yy += YY;
 
-        xxN = Pattern::flipsX(symmetries.special, xx, yy);
-        yyN = Pattern::flipsY(symmetries.special, xx, yy);
+        xxN = Pattern::flipsX(symmetries.special, xx, yy, boardsize-1, boardsize-1);
+        yyN = Pattern::flipsY(symmetries.special, xx, yy, boardsize-1, boardsize-1);
         xx = xxN;
         yy = yyN;
 
-        int XX1N = Pattern::flipsX(symmetries.special, XX1, YY1);
-        int YY1N = Pattern::flipsY(symmetries.special, XX1, YY1);
+        int XX1N = Pattern::flipsX(symmetries.special, XX1, YY1, boardsize-1, boardsize-1);
+        int YY1N = Pattern::flipsY(symmetries.special, XX1, YY1, boardsize-1, boardsize-1);
         XX1 = XX1N;
         YY1 = YY1N;
 
-        int XX2N = Pattern::flipsX(symmetries.special, XX2, YY2);
-        int YY2N = Pattern::flipsY(symmetries.special, XX2, YY2);
+        int XX2N = Pattern::flipsX(symmetries.special, XX2, YY2, boardsize-1);
+        int YY2N = Pattern::flipsY(symmetries.special, XX2, YY2, boardsize-1);
         XX2 = XX2N;
         YY2 = YY2N;
@@ -622 +622 @@
       }
       else
-        return 0,0,0,0;
+        return Py_BuildValue("iiii",0,0,0,0); 
     }
     else {
@@ -631 +631 @@
   else colorSwitch = cSymm;
 
-  if (continuations.has_key((xx, yy)))
-    continuations[(xx,yy)][cc] = continuations[(xx,yy)][cc]+1; // FIXME ...
+  PyObject* xxyyPY = Py_BuildValue("(ii)", xx, yy);
+  PyObject* scxy;
+
+  if ((scxy = PyDict_GetItem(continuations, xxyy))) {
+    PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, cc))+1);
+    PyDict_SetItemString(scxy, cc, temp);
+    Py_DECREF(temp);
+    text = PyString_AsString(PyDict_GetItemString(scxy, "N"))[0];
+  }
   else {
     if (contLabelsIndex >= len(contLabels)) text = '?';
@@ -639 +646 @@
       contLabelsIndex++;
     }
-    if (cc == 'B') 
-      continuations[(xx,yy)] = {'B':1, 'W':0,
-                                'tB':0, 'tW':0,
-                                'wB':0,'lB':0,'wW':0,'lW':0,
-                                'N': text};
-    else
-      continuations[(xx,yy)] = {'B':0, 'W':1, 'tB':0, 'tW':0, 'wB':0, 'lB':0,
-                                'wW':0, 'lW':0, 'N': text};
-                          
-    if (foundWhere != counter && foundWhere != counter+1) 
-      continuations[(xx,yy)]['t'+cc] += 1;
+
+    if (strcmp(cc, "B")==0) {
+      scxy = PyDict_New();
+      PyObject* Py0 = PyInt_FromLong(0);
+      PyObject *Py1 = PyInt_FromLong(1);
+      PyDict_SetItemString(scxy, "B", Py1);
+      PyDict_SetItemString(scxy, "W", Py0);
+      PyDict_SetItemString(scxy, "tB", Py0);
+      PyDict_SetItemString(scxy, "tW", Py0);
+      PyDict_SetItemString(scxy, "wB", Py0);
+      PyDict_SetItemString(scxy, "lB", Py0);
+      PyDict_SetItemString(scxy, "wW", Py0);
+      PyDict_SetItemString(scxy, "lW", Py0);
+      PyDict_SetItemString(scxy, "N", PyString_FromStringAndSize(&text, 1));
+      Py_DECREF(Py0);
+      Py_DECREF(Py1);
+      PyDict_SetItem(continuations, xxyyPY, scxy);
+      Py_DECREF(scxy);
+    }
+    else {
+      scxy = PyDict_New();
+      PyObject *Py0 = PyInt_FromLong(0);
+      PyObject *Py1 = PyInt_FromLong(1);
+      PyDict_SetItemString(scxy, "B", Py0);
+      PyDict_SetItemString(scxy, "W", Py1);
+      PyDict_SetItemString(scxy, "tB", Py0);
+      PyDict_SetItemString(scxy, "tW", Py0);
+      PyDict_SetItemString(scxy, "wB", Py0);
+      PyDict_SetItemString(scxy, "lB", Py0);
+      PyDict_SetItemString(scxy, "wW", Py0);
+      PyDict_SetItemString(scxy, "lW", Py0);
+      PyDict_SetItemString(scxy, "N", PyString_FromStringAndSize(&text, 1));
+      Py_DECREF(Py0);
+      Py_DECREF(Py1);
+      PyDict_SetItem(continuations, xxyyPY, scxy);
+      Py_DECREF(scxy);
+    }
+
+    Py_DECREF(xxyyPY);
+
+    char tcc[3]; tcc[0]='t'; tcc[1]=cc; tcc[2]=0;
+    char lcc[3]; lcc[0]='l'; lcc[1]=cc; lcc[2]=0;
+    char wcc[3]; wcc[0]='w'; wcc[1]=cc; wcc[2]=0;
+
+    if (foundWhere != counter && foundWhere != counter+1) {
+      PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, tcc))+1);
+      PyDict_SetItemString(scxy, tcc, temp);
+      Py_DECREF(temp);
+    }
 
     if (winner == 'B')
-      if (!(data[index].colorSwitch || colorSwitch))
-        continuations[(xx,yy)]['w'+cc] += 1;
-      else continuations[(xx,yy)]['l'+cc] += 1;
+      if (!(data[index].colorSwitch || colorSwitch)) {
+        PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, wcc))+1);
+        PyDict_SetItemString(scxy, wcc, temp);
+        Py_DECREF(temp);
+      }
+      else {
+        PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, lcc))+1);
+        PyDict_SetItemString(scxy, lcc, temp);
+        Py_DECREF(temp);
+      }
     else if (winner == 'W')
-      if (!(self.data[index].colorSwitch or colorSwitch))
-        continuations[(xx,yy)]['l'+cc] += 1;
-      else continuations[(xx,yy)]['w'+cc] += 1;
-  }
-  return 1, continuations[(xx,yy)]['N'], contLabelsIndex, (self.data[index].colorSwitch or colorSwitch)
-}
-
+      if (!(data[index].colorSwitch || colorSwitch)) {
+        PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, lcc))+1);
+        PyDict_SetItemString(scxy, lcc, temp);
+        Py_DECREF(temp);
+      }
+      else {
+        PyObject *temp = PyInt_FromLong(PyInt_AsLong(PyDict_GetItemString(scxy, wcc))+1);
+        PyDict_SetItemString(scxy, wcc, temp);
+        Py_DECREF(temp);
+      }
+  }
+  return Py_BuildValue("icii", 1, continuations[(xx,yy)]['N'], contLabelsIndex, 
+                       (self.data[index].colorSwitch or colorSwitch));
+}
+