Initial support for right-turn-only metric (as would be appropriate for,

say, Topsy-Turvy).

Author: rokicki

src/canon.cpp

@@ -121,10 +121,17 @@ void makecanonstates(puzdef &pd) {
                continue ;
             }
             if (ms == prevm) {
-               if (2*(prevcnt+1)+(pd.moves[ms].twist != 1) >
-                   pd.basemoveorders[pd.moves[ms].base]) {
-                  canonmask[fromst] |= 1LL << m ;
-                  continue ;
+               if (quarter == 1) {
+                  if (2*(prevcnt+1)+(pd.moves[ms].twist != 1) >
+                      pd.basemoveorders[pd.moves[ms].base]) {
+                     canonmask[fromst] |= 1LL << m ;
+                     continue ;
+                  }
+               } else {
+                  if ((prevcnt+1) == pd.basemoveorders[pd.moves[ms].base]) {
+                     canonmask[fromst] |= 1LL << m ;
+                     continue ;
+                  }
                }
             }
             thism = ms ;

src/prunetable.cpp

@@ -44,10 +44,17 @@ void fillworker::init(const puzdef &pd, int d_) {
       delete looktmp ;
       looktmp = 0 ;
    }
-   looktmp = new allocsetval(pd, pd.solved) ;
-   while (posns.size() <= 100 || (int)posns.size() <= d_+1)
-      posns.push_back(allocsetval(pd, pd.solved)) ;
-   pd.assignpos(posns[0], pd.solved) ;
+   if (quarter < 2) {
+      looktmp = new allocsetval(pd, pd.solved) ;
+      while (posns.size() <= 100 || (int)posns.size() <= d_+2)
+         posns.push_back(allocsetval(pd, pd.solved)) ;
+      pd.assignpos(posns[0], pd.solved) ;
+   } else {
+      looktmp = new allocsetval(pd, pd.id) ;
+      while (posns.size() <= 100 || (int)posns.size() <= d_+2)
+         posns.push_back(allocsetval(pd, pd.id)) ;
+      pd.assignpos(posns[0], pd.id) ;
+   }
    d = d_ ;
    for (int i=0; i<MEMSHARDS; i++)
       fillbufs[i].nchunks = 0 ;
@@ -118,11 +125,21 @@ ull fillworker::filltable(const puzdef &pd, prunetable &pt, int togo,
    ull r = 0 ;
    if (togo == 0) {
       ull h ;
-      if ((int)pd.rotgroup.size() > 1) {
-         slowmodm2(pd, posns[sp], *looktmp) ;
-         h = pt.indexhash(pd.totsize, *looktmp) ;
+      if (quarter >= 2) {
+         pd.mulinv(pd.solved, posns[sp], posns[sp+1]) ;
+         if ((int)pd.rotgroup.size() > 1) {
+            slowmodm2(pd, posns[sp+1], *looktmp) ;
+            h = pt.indexhash(pd.totsize, *looktmp) ;
+         } else {
+            h = pt.indexhash(pd.totsize, posns[sp+1]) ;
+         }
       } else {
-         h = pt.indexhash(pd.totsize, posns[sp]) ;
+         if ((int)pd.rotgroup.size() > 1) {
+            slowmodm2(pd, posns[sp], *looktmp) ;
+            h = pt.indexhash(pd.totsize, *looktmp) ;
+         } else {
+            h = pt.indexhash(pd.totsize, posns[sp]) ;
+         }
       }
       int shard = (h >> pt.shardshift) ;
       fillbuf &fb = fillbufs[shard] ;
@@ -363,6 +380,8 @@ void prunetable::addsumdat(const puzdef &pd, string &filename) const {
 }
 string prunetable::makefilename(const puzdef &pd) const {
    string filename = "tws5-" + inputbasename + "-" ;
+   if (quarter > 1)
+      filename += "q" ;
    if (quarter)
       filename += "q-" ;
    ull bytes = size >> 2 ;

src/puzdef.h

@@ -148,6 +148,32 @@ struct puzdef {
          cp += n ;
       }
    }
+   void mulinv(const setval a, const setval b, setval c) const {
+      const uchar *ap = a.dat ;
+      const uchar *bp = b.dat ;
+      uchar *cp = c.dat ;
+      memset(cp, 0, totsize) ;
+      for (int i=0; i<(int)setdefs.size(); i++) {
+         const setdef &sd = setdefs[i] ;
+         int n = sd.size ;
+         for (int j=0; j<n; j++)
+            cp[bp[j]] = ap[j] ;
+         ap += n ;
+         bp += n ;
+         cp += n ;
+         if (sd.omod > 1) {
+            uchar *moda = gmoda[sd.omod] ;
+            for (int j=0; j<n; j++)
+               cp[bp[j-n]] = moda[ap[j]+sd.omod-bp[j]] ;
+         } else {
+            for (int j=0; j<n; j++)
+               cp[j] = 0 ;
+         }
+         ap += n ;
+         bp += n ;
+         cp += n ;
+      }
+   }
    void mul3(const setval a, const setval b, const setval c, setval d) const {
       const uchar *ap = a.dat ;
       const uchar *bp = b.dat ;