If the puzzle is "unknownpuzzle", output a full hash including both

the puzzle definition and the options.

Author: rokicki

src/cpp/prunetable.cpp

@@ -371,9 +371,13 @@ void prunetable::checkextend(const puzdef &pd, int ignorelookup) {
 // if someone set options that affect the hash, we add a suffix to the
 // data file name to reflect this.
 void prunetable::addsumdat(const puzdef &pd, string &filename) const {
+   ull t = pd.optionssum ;
+   if (inputbasename == UNKNOWNPUZZLE)
+      t ^= pd.checksum ;
+   if (t == 0)
+      return ;
    filename.push_back('-') ;
    filename.push_back('o') ;
-   ull t = pd.optionssum ;
    while (t) {
       int v = t % 36 ;
       t /= 36 ;
@@ -412,8 +416,7 @@ string prunetable::makefilename(const puzdef &pd) const {
    filename += to_string(bytes) ;
    if (suffix)
       filename += suffix ;
-   if (pd.optionssum)
-      addsumdat(pd, filename) ;
+   addsumdat(pd, filename) ;
    filename += ".dat" ;
    return filename ;
 }

src/cpp/prunetable.h

@@ -20,6 +20,7 @@
 const int CACHELINESIZE = 64 ;
 const int COMPSIGNATURE = 23 ; // start and end of data files
 const int UNCOMPSIGNATURE = 24 ; // start and end of data files
+#define UNKNOWNPUZZLE "unknownpuzzle"
 extern string inputbasename ;
 extern int nowrite ;
 extern int startprunedepth ;

src/cpp/twsearch.cpp

@@ -112,7 +112,7 @@ void reseteverything() {
    looseiper = 0 ;
    basebits = 0 ;
    usehashenc = 0 ;
-   inputbasename = "unknownpuzzle" ;
+   inputbasename = UNKNOWNPUZZLE ;
    startprunedepth = 3 ;
    workerparams.clear() ;
    dllstates = 0 ;