Merge pull request #869 from deepmind:lanctot-patch-34

PiperOrigin-RevId: 457528731 Change-Id: If90b3a3f5f132a7c134f93243ede27547ddb3b7c
google-deepmind · Jun 27, 2022 · 6a49b93 · 6a49b93
2 parents 15145eb + 3420e55
commit 6a49b93
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/open_spiel/game_parameters.h b/open_spiel/game_parameters.h
@@ -15,13 +15,14 @@
 #ifndef OPEN_SPIEL_GAME_PARAMETERS_H_
 #define OPEN_SPIEL_GAME_PARAMETERS_H_
 
+#include <iostream>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "open_spiel/spiel_utils.h"
 #include "open_spiel/abseil-cpp/absl/types/optional.h"
+#include "open_spiel/spiel_utils.h"
 
 namespace open_spiel {
 
@@ -157,6 +158,9 @@ class GameParameter {
       case Type::kUnset:
         return rhs.type_ == Type::kUnset;
     }
+    std::cerr << "Unrecognized parameter type in operator=="
+              << ", returning false." << std::endl;
+    return false;
   }
   bool operator!=(const GameParameter& rhs) const { return !(*this == rhs); }
 

diff --git a/open_spiel/games/amazons.cc b/open_spiel/games/amazons.cc
@@ -380,6 +380,10 @@ std::string AmazonsState::ActionToString(Player player, Action action) const {
       return absl::StrCat(StateToString(PlayerToState(player)),
                           " Shoot:  ", str);
   }
+
+  std::cerr << "Unhandled case in AmazonState::ActionToString, "
+            << "returning empty string." << std::endl;
+  return "";
 }
 
 // Looks okay

diff --git a/open_spiel/python/egt/dynamics_test.py b/open_spiel/python/egt/dynamics_test.py
@@ -63,7 +63,8 @@ def test__sum_j_x_j_ln_x_j_over_x_i(self):
     expected_2 = np.asarray([expected_0, expected_1, expected_2])
     np.testing.assert_array_equal(expected, expected_2)
 
-    np.testing.assert_array_equal(expected, _sum_j_x_j_ln_x_j_over_x_i(x))
+    np.testing.assert_array_almost_equal(expected,
+                                         _sum_j_x_j_ln_x_j_over_x_i(x))
 
 
 class DynamicsTest(parameterized.TestCase):