Project

General

Profile

« Previous | Next » 

Revision 31d0a3fc

Added by Leszek Koltunski about 1 year ago

CU_323 solver: don't use this for scrambling.

View differences:

src/main/java/org/distorted/objectlib/scrambling/ObjectScrambler.java
88 88
      mLastRot = LAST_SL;
89 89
      }
90 90

  
91
    mTablebase = tablebase;
91
    mTablebase = (tablebase.useForScrambling() ? tablebase : null);
92 92
    }
93 93

  
94 94
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/objectlib/tablebases/TBCuboid323.java
174 174
      }
175 175
    }
176 176

  
177
///////////////////////////////////////////////////////////////////////////////////////////////////
178
// this is too slow to be used for scrambling - scramble the 3x3x2 the old way.
179

  
180
  @Override
181
  public boolean useForScrambling()
182
    {
183
    return false;
184
    }
185

  
177 186
///////////////////////////////////////////////////////////////////////////////////////////////////
178 187
// specifically for the tablebase
179 188
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/objectlib/tablebases/TablebasesAbstract.java
295 295
              }
296 296

  
297 297
          int childIndex = getIndex(tmpQuats);
298
          if( mTablebase.insertUnpacked(childIndex,newLevel) )
299
            {
300
            //android.util.Log.e("D", newLevel+" parent:"+index+" index: "+childIndex+" ax="+ax+" layer="+layer+" angle="+angle);
301
            ret++;
302
            }
303
          else
304
            {
305
            //android.util.Log.d("D", newLevel+" parent:"+index+" index: "+childIndex+" ax="+ax+" layer="+layer+" angle="+angle);
306
            }
298
          if( mTablebase.insertUnpacked(childIndex,newLevel) ) ret++;
307 299
          }
308 300
        }
309 301

  
......
313 305
    return ret;
314 306
    }
315 307

  
308
///////////////////////////////////////////////////////////////////////////////////////////////////
309

  
310
  public boolean useForScrambling()
311
    {
312
    return true;
313
    }
314

  
316 315
///////////////////////////////////////////////////////////////////////////////////////////////////
317 316

  
318 317
  public void createTablebase(int maxLevel)

Also available in: Unified diff