Merge pull request #37 from dds-bridge/develop

sorenhein · sorenhein · commit 0cb353a48e50 · 2015-01-18T09:35:39.000+01:00
Cumulative update for (new) v2.8.1
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@ DDS offers a wide range of functions, including par-score calculations.
 
 Please refer to the [home page](http://privat.bahnhof.se/wb758135) for details.
 
-The current version is DDS 2.8.0 released in November 2014 and licensed under the Apache 2.0 license in the LICENSE FILE.
+The current version is DDS 2.8.1 released in January 2015 and licensed under the Apache 2.0 license in the LICENSE FILE.
 
 Release notes are in the ChangeLog file.
 
-(c) Bo Haglund 2006-2014, (c) Bo Haglund / Soren Hein 2014.
+(c) Bo Haglund 2006-2014, (c) Bo Haglund / Soren Hein 2014-2015.
 
 
 Credits
@@ -83,7 +83,7 @@ The DDS library interface is very well documented. You find the docs, including
 
 Bugs
 ====
-Version 2.8.0 has no known bugs.
+Version 2.8.1 has no known bugs.
 
 Please report bugs to bo.haglund@bahnhof.se and soren.hein@gmail.com.
 
diff --git a/include/dll.h b/include/dll.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
@@ -26,8 +26,8 @@
   #define EXTERN_C
 #endif
 
-/* Version 2.8.0. Allowing for 2 digit minor versions */
-#define DDS_VERSION 20800
+/* Version 2.8.1. Allowing for 2 digit minor versions */
+#define DDS_VERSION 20801
 
 
 #define DDS_HANDS 4
diff --git a/include/portab.h b/include/portab.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/ABsearch.cpp b/src/ABsearch.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/ABsearch.h b/src/ABsearch.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/ABstats.cpp b/src/ABstats.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/ABstats.h b/src/ABstats.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/CalcTables.cpp b/src/CalcTables.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/DealerPar.cpp b/src/DealerPar.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Init.cpp b/src/Init.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Init.h b/src/Init.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/LaterTricks.cpp b/src/LaterTricks.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/LaterTricks.h b/src/LaterTricks.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Moves.cpp b/src/Moves.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Moves.h b/src/Moves.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/PBN.cpp b/src/PBN.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/PBN.h b/src/PBN.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Par.cpp b/src/Par.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/PlayAnalyser.cpp b/src/PlayAnalyser.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/QuickTricks.cpp b/src/QuickTricks.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/QuickTricks.h b/src/QuickTricks.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Scheduler.cpp b/src/Scheduler.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Scheduler.h b/src/Scheduler.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/SolveBoard.cpp b/src/SolveBoard.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/SolveBoard.h b/src/SolveBoard.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/SolverIF.cpp b/src/SolverIF.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
@@ -1103,7 +1103,7 @@ void LastTrickWinner(
   {
     hp = handId(dl->first, h);
     lastTrickSuit[hp] = dl->currentTrickSuit[h];
-    lastTrickRank[hp] = bitMapRank[dl->currentTrickRank[h]];
+    lastTrickRank[hp] = dl->currentTrickRank[h];
   }
 
   for (h = handRelFirst; h < DDS_HANDS; h++)
@@ -1114,7 +1114,7 @@ void LastTrickWinner(
       if (thrp->suit[hp][s] != 0)
       {
         lastTrickSuit[hp] = s;
-        lastTrickRank[hp] = thrp->suit[hp][s];
+        lastTrickRank[hp] = highestRank[thrp->suit[hp][s]];
         break;
       }
     }
@@ -1157,8 +1157,9 @@ void LastTrickWinner(
     }
   }
 
-  * leadRank = lastTrickRank[handRelFirst];
-  * leadSuit = lastTrickSuit[handRelFirst];
+  hp = handId(dl->first, handRelFirst);
+  * leadRank = lastTrickRank[hp];
+  * leadSuit = lastTrickSuit[hp];
   * leadSideWins = ((handToPlay == maxHand ||
                      partner[handToPlay] == maxHand) ? 1 : 0);
 }
diff --git a/src/SolverIF.h b/src/SolverIF.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Stats.cpp b/src/Stats.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Stats.h b/src/Stats.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Timer.cpp b/src/Timer.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/Timer.h b/src/Timer.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/TransTable.cpp b/src/TransTable.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/TransTable.h b/src/TransTable.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/dds.cpp b/src/dds.cpp
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/dds.h b/src/dds.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/debug.h b/src/debug.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
diff --git a/src/threadmem.h b/src/threadmem.h
@@ -2,7 +2,7 @@
    DDS, a bridge double dummy solver.
 
    Copyright (C) 2006-2014 by Bo Haglund /
-   2014 by Bo Haglund & Soren Hein.
+   2014-2015 by Bo Haglund & Soren Hein.
 
    See LICENSE and README.
 */
