Changeset 8756 for trunk/MagicSoft/Mars/mtools

Timestamp:

10/13/07 19:56:29 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtools

Files:

• MagicReversi.cc (modified) (5 diffs)
• MagicReversi.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mtools/MagicReversi.cc

@@ -481 +481 @@
 }
 
-Int_t MagicReversi::GetDirection(Int_t src, Int_t dst) const
-{
-    const MGeomPix &pix1=(*fGeomCam)[dst];
-    const MGeomPix &pix2=(*fGeomCam)[src];
-
-    const Double_t x1 = pix1.GetX();
-    const Double_t y1 = pix1.GetY();
-
-    const Double_t x2 = pix2.GetX();
-    const Double_t y2 = pix2.GetY();
-
-    if (x1>=x2 && y1>y2) return kRightTop;
-    if (x1>=x2 && y1<y2) return kRightBottom;
-    if (x1<=x2 && y1>y2) return kLeftTop;
-    if (x1<=x2 && y1<y2) return kLeftBottom;
-    if (x1>x2)           return kRight;
-    if (x1<x2)           return kLeft;
-
-    return -1;
-}
-
-Int_t MagicReversi::GetNeighbor(Int_t idx, Int_t dir) const
-{
-    MGeomPix &pix=(*fGeomCam)[idx];
-
-    //
-    // search for the neighbor in the given direction
-    //
-    int i;
-    for (i=0; i<pix.GetNumNeighbors(); i++)
-        if (GetDirection(idx, pix.GetNeighbor(i))==dir)
-            return pix.GetNeighbor(i);
-
-    return -1;
-}
-
 Bool_t MagicReversi::Flip(Int_t origidx, Bool_t flip)
 {
@@ -523 +487 @@
     int test[6] = {0,0,0,0,0,0};
 
-    for (int dir=kRightTop; dir<=kLeftTop; dir++)
+    for (int dir=MGeomPix::kRightTop; dir<=MGeomPix::kLeftTop; dir++)
     {
         Int_t idx = origidx;
@@ -530 +494 @@
         while (1)
         {
-            idx = GetNeighbor(idx, dir);
+            idx = fGeomCam->GetNeighbor(idx, dir);
             if (idx<0 || (*this)[idx].GetFillColor()==kEmpty)
                 break;
@@ -547 +511 @@
     int cnt = 0;
 
-    for (int dir=kRightTop; dir<=kLeftTop; dir++)
+    for (int dir=MGeomPix::kRightTop; dir<=MGeomPix::kLeftTop; dir++)
     {
         Int_t idx = origidx;
@@ -557 +521 @@
             for (int i=0; i<test[dir]; i++)
             {
-                idx = GetNeighbor(idx, dir);
+                idx = fGeomCam->GetNeighbor(idx, dir);
 
                 fUsrPts[(*this)[idx].GetFillColor()-kRed]--;

trunk/MagicSoft/Mars/mtools/MagicReversi.h

@@ -19 +19 @@
 {
 private:
-    enum {
-        kRightTop,
-        kRight,
-        kRightBottom,
-        kLeftBottom,
-        kLeft,
-        kLeftTop
-    };
-//    static const Int_t fColorBombs[7]; // colors for the hexagons
-
     MGeomCam      *fGeomCam;       // pointer to camera geometry
 
@@ -73 +63 @@
 
     Bool_t Flip(Int_t idx, Bool_t flip);
-    Int_t  GetDirection(Int_t src, Int_t dst) const;
-    Int_t  GetNeighbor(Int_t idx, Int_t dir) const;
     Bool_t CheckMoves();