v2.3.3

gekomad · gekomad · commit f0f2b31c5843 · 2020-10-31T12:13:50.000+01:00
diff --git a/src/Hash.cpp b/src/Hash.cpp
@@ -31,7 +31,7 @@ Hash::Hash() {
 }
 
 void Hash::clearAge() {
-    for (int i = 0; i < HASH_SIZE; i++) {
+    for (unsigned i = 0; i < HASH_SIZE; i++) {
         hashArray[HASH_ALWAYS][i].u.dataS.entryAge = 0;
     }
 }
@@ -44,14 +44,10 @@ void Hash::clearHash() {
     memset(static_cast<void*>(hashArray[HASH_ALWAYS]), 0, sizeof(_Thash) * HASH_SIZE);
 }
 
-int Hash::getHashSize() const {
-    return HASH_SIZE / (1024 * 1024 / (sizeof(_Thash) * 2));
-}
-
 void Hash::setHashSize(int mb) {
     dispose();
     if (mb > 0) {
-        int tmp = mb * 1024 * 1024 / (sizeof(_Thash) * 2);
+        u64 tmp = (u64)mb * 1024 * 1024 / (sizeof(_Thash) * 2);
         hashArray[HASH_ALWAYS] = (_Thash *) calloc(tmp, sizeof(_Thash));
         if (!hashArray[HASH_ALWAYS]) {
             fatal("info string error - no memory");
diff --git a/src/Hash.h b/src/Hash.h
@@ -80,8 +80,6 @@ class Hash : public Singleton<Hash> {
 
     void setHashSize(int mb);
 
-    int getHashSize() const;
-
     void clearHash();
 
     void clearAge();
@@ -106,7 +104,7 @@ class Hash : public Singleton<Hash> {
 
     void recordHash(const u64 zobristKey, _ThashData &tmp) {
         ASSERT(zobristKey);
-        const int kMod = zobristKey % HASH_SIZE;
+        const unsigned kMod = zobristKey % HASH_SIZE;
         _Thash *rootHashG = &(hashArray[HASH_ALWAYS][kMod]);
 
         rootHashG->key = (zobristKey ^ tmp.dataU);
@@ -139,7 +137,7 @@ class Hash : public Singleton<Hash> {
 
 private:
     Hash();
-    int HASH_SIZE;
+    unsigned HASH_SIZE;
 #ifdef JS_MODE
     static constexpr int HASH_SIZE_DEFAULT = 1;
 #else
diff --git a/src/Search.cpp b/src/Search.cpp
@@ -945,11 +945,9 @@ int Search::search(int depth, int alpha, const int beta, _TpvLine *pline, const
         ASSERT(chessboard[KING_BLACK])
         ASSERT(chessboard[KING_WHITE])
 
-//        move->s.score1 = score;
         if (score > alpha) {
             if (score >= beta) {
                 decListId();
-//                ASSERT(move->s.score1 == score);
                 INC(nCutAB);
                 ADD(betaEfficiency, betaEfficiencyCount / (double) listcount * 100.0);
                 if (getRunning()) {
diff --git a/src/namespaces/constants.h b/src/namespaces/constants.h
@@ -26,7 +26,7 @@
 using namespace std;
 namespace constants {
     
-    static const string NAME = "Cinnamon 2.3.2";
+    static const string NAME = "Cinnamon 2.3.3";
     static const string STARTPOS = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
     static constexpr int BLACK = 0;
     static constexpr int WHITE = 1;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Hash::Hash() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`void Hash::clearAge() {`
`34`		`- for (int i = 0; i < HASH_SIZE; i++) {`
	`34`	`+ for (unsigned i = 0; i < HASH_SIZE; i++) {`
`35`	`35`	`hashArray[HASH_ALWAYS][i].u.dataS.entryAge = 0;`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -44,14 +44,10 @@ void Hash::clearHash() {`
`44`	`44`	`memset(static_cast<void>(hashArray[HASH_ALWAYS]), 0, sizeof(_Thash) HASH_SIZE);`
`45`	`45`	`}`
`46`	`46`
`47`		`-int Hash::getHashSize() const {`
`48`		`- return HASH_SIZE / (1024 * 1024 / (sizeof(_Thash) * 2));`
`49`		`-}`
`50`		`-`
`51`	`47`	`void Hash::setHashSize(int mb) {`
`52`	`48`	`dispose();`
`53`	`49`	`if (mb > 0) {`
`54`		`- int tmp = mb * 1024 * 1024 / (sizeof(_Thash) * 2);`
	`50`	`+ u64 tmp = (u64)mb * 1024 * 1024 / (sizeof(_Thash) * 2);`
`55`	`51`	`hashArray[HASH_ALWAYS] = (_Thash *) calloc(tmp, sizeof(_Thash));`
`56`	`52`	`if (!hashArray[HASH_ALWAYS]) {`
`57`	`53`	`fatal("info string error - no memory");`