diff --git a/src/engine/local_engine/arraydata.cpp b/src/engine/local_engine/arraydata.cpp index 32501652..e1fcf24f 100644 --- a/src/engine/local_engine/arraydata.cpp +++ b/src/engine/local_engine/arraydata.cpp @@ -20,6 +20,7 @@ #include "arraydata.h" +using namespace std; struct RoundData { @@ -1055,11 +1056,9 @@ vector< vector > ArrayData::getHandChancePreflop(int handCode) { int i; vector< vector > chance(2); - vector chance_0(10); - vector chance_1(10); - chance[0] = chance_0; - chance[1] = chance_1; + chance[0].resize(10); + chance[1].resize(10); for(i=0;i<10;i++) { chance[0][i] = 0; diff --git a/src/engine/local_engine/arraydata.h b/src/engine/local_engine/arraydata.h index 843d5623..51af34f2 100644 --- a/src/engine/local_engine/arraydata.h +++ b/src/engine/local_engine/arraydata.h @@ -22,11 +22,8 @@ #include -#include #include -using namespace std; - class ArrayData{ public: ArrayData(); @@ -34,7 +31,7 @@ public: ~ArrayData(); void getHandChancePreflop(int, int**); - vector< vector > getHandChancePreflop(int); + std::vector< std::vector > getHandChancePreflop(int); }; #endif diff --git a/src/engine/local_engine/cardsvalue.cpp b/src/engine/local_engine/cardsvalue.cpp index b77b74d6..afeea5fc 100755 --- a/src/engine/local_engine/cardsvalue.cpp +++ b/src/engine/local_engine/cardsvalue.cpp @@ -19,6 +19,8 @@ ***************************************************************************/ #include "cardsvalue.h" +using namespace std; + CardsValue::CardsValue() { } @@ -568,11 +570,9 @@ vector< vector > CardsValue::calcCardsChance(GameState beRoID, int* playerC int i,j; vector< vector > chance(2); - vector chance_0(10); - vector chance_1(10); - chance[0] = chance_0; - chance[1] = chance_1; + chance[0].resize(10); + chance[1].resize(10); for(i=0;i<10;i++) { chance[0][i] = 0; diff --git a/src/engine/local_engine/cardsvalue.h b/src/engine/local_engine/cardsvalue.h index be9b559d..fa2abb53 100755 --- a/src/engine/local_engine/cardsvalue.h +++ b/src/engine/local_engine/cardsvalue.h @@ -24,10 +24,9 @@ #include "arraydata.h" #include "tools.h" -#include #include -using namespace std; + class CardsValue{ public: @@ -41,7 +40,7 @@ public: int holeCardsToIntCode(int*); int* intCodeToHoleCards(int); - vector< vector > calcCardsChance(GameState, int*, int*); + std::vector< std::vector > calcCardsChance(GameState, int*, int*); int** showdown(GameState, int**, int); };