removed defunct tinymt32.cpp. Fixed an issue where Enum was outdated.…

… changed some logic in RNG.
utexas-bwi · Oct 14, 2014 · 1f0abb1 · 1f0abb1
1 parent 2434a6e
commit 1f0abb1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 157 deletions.
diff --git a/bwi_tools/CMakeLists.txt b/bwi_tools/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(${PROJECT_NAME}_json
 )
 
 add_library(${PROJECT_NAME}
-  src/common/tinymt32.cpp
+  src/common/Enum.cpp
   src/common/Util.cpp
 )
 

diff --git a/bwi_tools/include/bwi_tools/common/Enum.h b/bwi_tools/include/bwi_tools/common/Enum.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 #include <string.h>
-#include <bwi_rl/common/Params.h>
+#include <bwi_tools/common/Params.h>
 
 /**
 * @class EnumName

diff --git a/bwi_tools/include/bwi_tools/common/RNG.h b/bwi_tools/include/bwi_tools/common/RNG.h
@@ -13,29 +13,27 @@
 class RNG : public boost::mt19937 {
 
   public:
-    RNG (int seed) : boost::mt19937(seed) {}
+    RNG (unsigned int seed) : boost::mt19937(seed) {}
 
     inline float randomFloat() {
       boost::uniform_real<float> dist;
       boost::variate_generator<boost::mt19937&, boost::uniform_real<float> > gen(*this, dist);
       return gen();
     }
 
-    inline unsigned int randomUInt() {
-      boost::uniform_int<unsigned int> dist(0, std::numeric_limits<unsigned int>::max());
-      boost::variate_generator<boost::mt19937&, boost::uniform_int<unsigned int> > gen(*this, dist);
+    inline int randomInt(int min, int max) {
+      boost::uniform_int<int> dist(min, max);
+      boost::variate_generator<boost::mt19937&, boost::uniform_int<int> > gen(*this, dist);
       return gen();
     }
 
-    inline unsigned int randomInt(unsigned int max) {
-      boost::uniform_int<unsigned int> dist(0, max - 1);
-      boost::variate_generator<boost::mt19937&, boost::uniform_int<unsigned int> > gen(*this, dist);
-      return gen();
+    inline int randomInt(int max = std::numeric_limits<int>::max()) {
+      return randomInt(0, max);
     }
 
-    inline int randomInt(int min, int max) {
-      boost::uniform_int<int> dist(min, max - 1);
-      boost::variate_generator<boost::mt19937&, boost::uniform_int<int> > gen(*this, dist);
+    inline int randomUInt(unsigned int max = std::numeric_limits<unsigned int>::max()) {
+      boost::uniform_int<unsigned int> dist(0, max);
+      boost::variate_generator<boost::mt19937&, boost::uniform_int<unsigned int> > gen(*this, dist);
       return gen();
     }
 

diff --git a/bwi_tools/src/common/Enum.cpp b/bwi_tools/src/common/Enum.cpp
@@ -6,7 +6,7 @@
 * @author Thomas Röfer
 */
 
-#include <bwi_rl/common/Enum.h>
+#include <bwi_tools/common/Enum.h>
 #include <cassert>
 
 std::string EnumName::trim(const std::string& s)

diff --git a/bwi_tools/src/common/tinymt32.cpp b/bwi_tools/src/common/tinymt32.cpp