From d9d099fd24b44c43458f9b5f8fe66a8fb6795093 Mon Sep 17 00:00:00 2001 From: Soren Hein Date: Sun, 18 Jan 2015 09:17:17 +0100 Subject: [PATCH 1/2] LastTrickWinner was returning a relative hand, not an absolute one --- src/SolverIF.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SolverIF.cpp b/src/SolverIF.cpp index fea5601e..1c744782 100644 --- a/src/SolverIF.cpp +++ b/src/SolverIF.cpp @@ -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); } From 0f45c87441d52e72c75d589a5e1af3005ec73830 Mon Sep 17 00:00:00 2001 From: Soren Hein Date: Sun, 18 Jan 2015 09:28:14 +0100 Subject: [PATCH 2/2] Update of year and version number in all files --- README.md | 6 +++--- include/dll.h | 6 +++--- include/portab.h | 2 +- src/ABsearch.cpp | 2 +- src/ABsearch.h | 2 +- src/ABstats.cpp | 2 +- src/ABstats.h | 2 +- src/CalcTables.cpp | 2 +- src/DealerPar.cpp | 2 +- src/Init.cpp | 2 +- src/Init.h | 2 +- src/LaterTricks.cpp | 2 +- src/LaterTricks.h | 2 +- src/Moves.cpp | 2 +- src/Moves.h | 2 +- src/PBN.cpp | 2 +- src/PBN.h | 2 +- src/Par.cpp | 2 +- src/PlayAnalyser.cpp | 2 +- src/QuickTricks.cpp | 2 +- src/QuickTricks.h | 2 +- src/Scheduler.cpp | 2 +- src/Scheduler.h | 2 +- src/SolveBoard.cpp | 2 +- src/SolveBoard.h | 2 +- src/SolverIF.cpp | 2 +- src/SolverIF.h | 2 +- src/Stats.cpp | 2 +- src/Stats.h | 2 +- src/Timer.cpp | 2 +- src/Timer.h | 2 +- src/TransTable.cpp | 2 +- src/TransTable.h | 2 +- src/dds.cpp | 2 +- src/dds.h | 2 +- src/debug.h | 2 +- src/threadmem.h | 2 +- 37 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 9a730237..d98f1410 100644 --- 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 index 23bb4d90..d0ac3a44 100644 --- 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 index 53a69388..72cd62ad 100644 --- 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 index 507eefe6..cf5eb89f 100644 --- 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 index 160ff927..154d714b 100644 --- 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 index fdc6451e..1788c2c5 100644 --- 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 index c3e60d5d..5a9e00ff 100644 --- 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 index 7ee4d005..634ef543 100644 --- 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 index 34da5c87..eb42af1e 100644 --- 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 index 5b2ab495..dc5a01c7 100644 --- 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 index 9796a07f..2ba8072d 100644 --- 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 index 0bfdf2d8..a3655851 100644 --- 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 index 2a848b88..067785c4 100644 --- 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 index b6353914..54ab03bf 100644 --- 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 index e2bb1cf1..4ccff41a 100644 --- 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 index fc8a0b79..a21e07a8 100644 --- 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 index e5c00a99..aa3ac62c 100644 --- 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 index 1e1f85c9..5e078566 100644 --- 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 index dce68ae0..b5a97078 100644 --- 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 index 95fe74d2..d36b767d 100644 --- 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 index c6f85d02..b16f2e3f 100644 --- 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 index 9252aa03..ea20e14e 100644 --- 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 index 5ac31e95..6ac723c1 100644 --- 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 index 91bd9784..eced6a6a 100644 --- 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 index ac56fdfc..913477d9 100644 --- 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 index 1c744782..45babad7 100644 --- 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. */ diff --git a/src/SolverIF.h b/src/SolverIF.h index b36dfcb9..cafa2831 100644 --- 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 index 74d5ee0f..273e6531 100644 --- 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 index 691e2cd6..be2ba60f 100644 --- 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 index 60ce7dac..1ee15f41 100644 --- 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 index d9f9a8c1..c91a9958 100644 --- 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 index 646fcf6c..49d77ab5 100644 --- 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 index 18913d7b..45ed4959 100644 --- 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 index ca0f4f11..9c468b54 100644 --- 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 index 471c6139..9628f8ec 100644 --- 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 index fe69d0cd..1a6606e5 100644 --- 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 index 7a83fcbb..be18d8b7 100644 --- 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. */