Bo's new (old) TT code and general clean-up

dds-bridge · Mar 20, 2016 · c8503f1 · c8503f1
1 parent f1ec60d
commit c8503f1
Show file tree

Hide file tree

Showing 11 changed files with 1,303 additions and 53 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,9 @@
 Release Notes DDS 2.8.4
 -----------------------
-Added a lower-memory DLL version with a compile flag.
+Added a lower-memory DLL version with a compile flag.  This is about
+11-14% slower, but uses a lot less memory.  For example, for a 
+single thread on one PC, the memory usage was 24 MB rather than 110 MB.
+For 12 threads, the numbers were 89 MB rather than 1.1 GB.
 
 Added TDC 32-bit and 64-bit Makefiles contributed by Sergio Polini.
 

diff --git a/src/Init.cpp b/src/Init.cpp
@@ -690,7 +690,7 @@ void FreeThreadMem()
 {
   for (int k = 0; k < noOfThreads; k++)
   {
-    localVar[k].transTable.ResetMemory();
+    localVar[k].transTable.ResetMemory(FREE_THREAD_MEM);
     localVar[k].memUsed = localVar[k].transTable.MemoryInUse() +
                           ThreadMemoryUsed();
   }

diff --git a/src/Makefiles/Makefile_Visual b/src/Makefiles/Makefile_Visual
@@ -32,7 +32,7 @@ WARN_FLAGS	=		\
 	/wd4996			\
 	/WX
 
-# Here you can turn on warnings.
+# Here you can turn on warnings and add /DSMALL_MEMORY_OPTION.
 # CC_FULL_FLAGS	= $(CC_FLAGS)
 CC_FULL_FLAGS	= $(CC_FLAGS) $(WARN_FLAGS)
 

diff --git a/src/Makefiles/Makefile_cygwin b/src/Makefiles/Makefile_cygwin
@@ -55,7 +55,7 @@ WARN_FLAGS	= 		\
 	-Wno-unknown-pragmas 	\
 	-Wno-long-long
 
-# Here you can turn on warnings.
+# Here you can turn on warnings and add -DSMALL_MEMORY_OPTION
 # CC_FULL_FLAGS	= $(CC_FLAGS)
 CC_FULL_FLAGS	= $(CC_FLAGS) $(WARN_FLAGS)
 

diff --git a/src/Makefiles/Makefile_mingw b/src/Makefiles/Makefile_mingw
@@ -57,7 +57,7 @@ WARN_FLAGS	= 		\
 	-Wno-long-long		\
 	-Wno-format
 
-# Here you can turn on warnings.
+# Here you can turn on warnings and add -DSMALL_MEMORY_OPTION
 # CC_FULL_FLAGS	= $(CC_FLAGS)
 CC_FULL_FLAGS	= $(CC_FLAGS) $(WARN_FLAGS)
 

diff --git a/src/SolverIF.cpp b/src/SolverIF.cpp
@@ -205,7 +205,14 @@ int STDCALL SolveBoard(
        newTrump ||
        (thrp->nodes > SIMILARMAXWINNODES)))
   {
-    thrp->transTable.ResetMemory();
+    int reason = UNKNOWN_REASON;
+    if (thrp->nodes > SIMILARMAXWINNODES)
+      reason = TOO_MANY_NODES;
+    else if (newDeal && ! similarDeal)
+      reason = NEW_DEAL;
+    else if (newTrump)
+      reason = NEW_TRUMP;
+    thrp->transTable.ResetMemory(reason);
   }
 
   if (newDeal)

diff --git a/src/Timer.cpp b/src/Timer.cpp
@@ -162,7 +162,7 @@ void Timer::OutputDetails()
     fprintf(fp, "%-14s %10d %10lld %10.2f %10.0f %10.2f\n",
             name[no],
             count[no],
-            userCum[no],
+            static_cast<long long>(userCum[no]),
             static_cast<double>(userCum[no]) /
             static_cast<double>(count[no]),
             1000. * systCum[no],
@@ -251,8 +251,8 @@ void Timer::PrintStats()
   {
     fprintf(fp, "%-14s %8lld %10lld %6.2f %4.1f %10.0f %6.2f %4.1f\n",
             TIMER_NAMES[0],
-            AB_ct,
-            AB_ucum,
+            static_cast<long long>(AB_ct),
+            static_cast<long long>(AB_ucum),
             AB_ucum / static_cast<double>(AB_ct),
             100. * AB_ucum / all_ucum,
             1000. * AB_scum,
@@ -263,8 +263,8 @@ void Timer::PrintStats()
   {
     fprintf(fp, "%-14s %8lld %10lld %6s %4s %10.0f %6s %4s\n",
             TIMER_NAMES[0],
-            AB_ct,
-            AB_ucum,
+            static_cast<long long>(AB_ct),
+            static_cast<long long>(AB_ucum),
             "-",
             "-",
             1000. * AB_scum,
@@ -292,8 +292,8 @@ void Timer::PrintStats()
     {
       fprintf(fp, "%-14s %8lld %10lld %6.2f %4.1f %10.0f %6.2f %4.1f\n",
               TIMER_NAMES[no],
-              ct[no],
-              ucum,
+              static_cast<long long>(ct[no]),
+              static_cast<long long>(ucum),
               ucum / static_cast<double>(ct[no]),
               100. * ucum / all_ucum,
               1000. * scum,
@@ -304,8 +304,8 @@ void Timer::PrintStats()
     {
       fprintf(fp, "%-14s %8lld %10lld %6s %4s %10.0f %6s %4s\n",
               TIMER_NAMES[no],
-              ct[no],
-              ucum,
+              static_cast<long long>(ct[no]),
+              static_cast<long long>(ucum),
               "-",
               "-",
               1000. * scum,
@@ -318,7 +318,7 @@ void Timer::PrintStats()
   fprintf(fp, "%-14s %8s %10lld %6s %4s %10.0f\n\n\n",
           "Sum",
           "",
-          all_ucum,
+          static_cast<long long>(all_ucum),
           "",
           "",
           1000. * all_scum);
@@ -355,7 +355,7 @@ void Timer::PrintStats()
       fprintf(fp, "%-14s %8d %10lld %6.2f %4.1f %10.0f %6.2f %4.1f\n",
               name[TIMER_AB + no],
               count[no],
-              AB_userCum[no],
+              static_cast<long long>(AB_userCum[no]),
               AB_userCum[no] / static_cast<double>(count[no]),
               100. * AB_userCum[no] / AB_ucum,
               1000. * AB_systCum[no],
@@ -367,8 +367,8 @@ void Timer::PrintStats()
     fprintf(fp, "-----------------------------------\n");
     fprintf(fp, "%-14s %8lld %10lld %6s %4s %10.0f\n\n\n",
             "Sum",
-            AB_ct,
-            AB_ucum,
+            static_cast<long long>(AB_ct),
+            static_cast<long long>(AB_ucum),
             "",
             "",
             1000. * AB_scum);