From 5a7bd52687d35ed3376e528c8683b6e5f32d08f0 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Sun, 5 Aug 2012 19:28:18 +0000
Subject: [PATCH] DroidFish: Allow using more threads and more hash memory.
 Useful for network engines.

---
 DroidFish/res/values/strings.xml              | 20 +++++++++++++++----
 .../src/org/petero/droidfish/DroidFish.java   | 15 +-------------
 .../droidfish/engine/ExternalEngine.java      | 18 ++++++++++++++---
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 0beabc6..4626916 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -364,26 +364,38 @@ you are not actively using the program.\
         <item>2</item>
         <item>3</item>
         <item>4</item>
-    </string-array>
+        <item>6</item>
+        <item>8</item>
+        </string-array>
     <string-array name="engine_threads_values">
         <item>0</item>
         <item>1</item>
         <item>2</item>
         <item>3</item>
         <item>4</item>
-    </string-array>
+        <item>6</item>
+        <item>8</item>
+        </string-array>
     <string-array name="engine_hash_texts">
         <item>16 MB</item>
         <item>32 MB</item>
         <item>64 MB</item>
         <item>128 MB</item>
-    </string-array>
+        <item>256 MB</item>
+        <item>512 MB</item>
+        <item>1024 MB</item>
+        <item>2048 MB</item>
+        </string-array>
     <string-array name="engine_hash_values">
         <item>16</item>
         <item>32</item>
         <item>64</item>
         <item>128</item>
-    </string-array>
+        <item>256</item>
+        <item>512</item>
+        <item>1024</item>
+        <item>2048</item>
+        </string-array>
     <string-array name="moves_per_session_texts">
         <item>Whole Game</item>
         <item>1 move</item>
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 0e0f550..5d44d0d 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -787,7 +787,7 @@ public class DroidFish extends Activity implements GUIInterface {
         bookOptions.random = (settings.getInt("bookRandom", 500) - 500) * (3.0 / 500);
         setBookOptions();
 
-        engineOptions.hashMB = getHashMB();
+        engineOptions.hashMB = getIntSetting("hashMB", 16);
         engineOptions.hints = settings.getBoolean("tbHints", false);
         engineOptions.hintsEdit = settings.getBoolean("tbHintsEdit", false);
         engineOptions.rootProbe = settings.getBoolean("tbRootProbe", true);
@@ -824,19 +824,6 @@ public class DroidFish extends Activity implements GUIInterface {
         ctrl.prefsChanged();
     }
 
-    /** Get hash size in MB from settings, but reduce size to an amount that the device can handle. */
-    private final int getHashMB() {
-        int hashMB = getIntSetting("hashMB", 16);
-        if (hashMB > 16) {
-            int maxMem = (int)(Runtime.getRuntime().maxMemory() / (1024*1024));
-            if (maxMem < 16)
-                maxMem = 16;
-            if (hashMB > maxMem)
-                hashMB = maxMem;
-        }
-        return hashMB;
-    }
-
     private void updateButtons() {
         boolean largeButtons = settings.getBoolean("largeButtons", false);
         Resources r = getResources();
diff --git a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
index 42e213a..798080b 100644
--- a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
@@ -171,8 +171,8 @@ public class ExternalEngine extends UCIEngineBase {
     @Override
     public void initOptions(EngineOptions engineOptions) {
         super.initOptions(engineOptions);
-        hashMB = engineOptions.hashMB;
-        setOption("Hash", engineOptions.hashMB); 
+        hashMB = getHashMB(engineOptions.hashMB);
+        setOption("Hash", hashMB); 
         if (engineOptions.engineProbe) {
             gaviotaTbPath = engineOptions.gtbPath;
             setOption("GaviotaTbPath", engineOptions.gtbPath);
@@ -181,12 +181,24 @@ public class ExternalEngine extends UCIEngineBase {
         optionsInitialized = true;
     }
 
+    /** Reduce too large hash sizes. */
+    private final int getHashMB(int hashMB) {
+        if (hashMB > 16) {
+            int maxMem = (int)(Runtime.getRuntime().maxMemory() / (1024*1024));
+            if (maxMem < 16)
+                maxMem = 16;
+            if (hashMB > maxMem)
+                hashMB = maxMem;
+        }
+        return hashMB;
+    }
+
     /** @inheritDoc */
     @Override
     public boolean optionsOk(EngineOptions engineOptions) {
         if (!optionsInitialized)
             return true;
-        if (hashMB != engineOptions.hashMB)
+        if (hashMB != getHashMB(engineOptions.hashMB))
             return false;
         if (haveOption("gaviotatbpath") && !gaviotaTbPath.equals(engineOptions.gtbPath))
             return false;