Merge branch 'release/1.4.1'

kennethshackleton · Oct 22, 2016 · 1be6b01 · 1be6b01
2 parents 8e42a44 + fe24586
commit 1be6b01
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,30 @@
+### Change Log
+
+#### 1.4.1
+
+* Minor optimisation when ranking flushes.
+
+#### 1.4
+
+* Optimisation when ranking flushes.
+* Optimisation for initialising seven-card non-flush ranks.
+* Extended test coverage.
+
+#### 1.3
+
+* Complete renaming to "SKPokerEval".
+* Add version number.
+* Minor corrections.
+
+#### 1.2
+
+* Rename to SKPokerEval.
+
+#### 1.1
+
+* Travis CI.
+
+#### 1.0
+
+* Settle on publishing only in C++.
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(${PROJECT_NAME})
 # Versioning.
 set(SK_POKER_EVAL_VERSION_MAJOR 1)
 set(SK_POKER_EVAL_VERSION_MINOR 4)
-set(SK_POKER_EVAL_VERSION_PATCH 0)
+set(SK_POKER_EVAL_VERSION_PATCH 1)
 
 # Get the current commit.
 execute_process(

diff --git a/src/SevenEval.cpp b/src/SevenEval.cpp
@@ -201,7 +201,7 @@ short unsigned SevenEval::GetRank(int const i, int const j, int const k,
   }
   // Generate a flush key, and look up the rank.
   int flush_key = 0;
-  if (mDeckcardsSuit[i] == flush_suit) flush_key += mDeckcardsFlush[i];
+  if (mDeckcardsSuit[i] == flush_suit) flush_key  = mDeckcardsFlush[i];
   if (mDeckcardsSuit[j] == flush_suit) flush_key += mDeckcardsFlush[j];
   if (mDeckcardsSuit[k] == flush_suit) flush_key += mDeckcardsFlush[k];
   if (mDeckcardsSuit[l] == flush_suit) flush_key += mDeckcardsFlush[l];
@@ -210,4 +210,3 @@ short unsigned SevenEval::GetRank(int const i, int const j, int const k,
   if (mDeckcardsSuit[p] == flush_suit) flush_key += mDeckcardsFlush[p];
   return mFlushRankPtr[flush_key];
 }
-