Some fixes in seed method

Author: carlosmpsilva

main/main.script

@@ -35,40 +35,46 @@ local function test_pcg32_double_numbers()
 	assert_double(next(), 0.74860336142592)
 end
 
+
+local function check_pcg32_42_54_seed(pcg)
+
+	local function next() 
+		return pcg:range(1, 100)
+	end
+	
+	assert(next() == 84)
+	assert(next() == 98)
+	assert(next() == 25)
+	assert(next() == 56)
+	assert(next() == 56)	
+end
+
 local function test_pcg32_ranges()
 
 	local pcg = rng.pcg32(42, 54)
 
-	local function next(min, max) 
-		return pcg:range(min, max)
-	end
+	check_pcg32_42_54_seed(pcg)
 
-	assert(next(1, 100) == 84)
-	assert(next(1, 100) == 98)
-	assert(next(1, 100) == 25)
-	assert(next(1, 100) == 56)
-	assert(next(1, 100) == 56)
-	
-	assert(next(50, 50) == 50)
-	assert(not pcall(function() next(100, 1) end))
+	assert(pcg:range(50, 50) == 50)
+	assert(not pcall(function() pcg:range(100, 1) end))
 end
 
 local function test_pcg32_double_ranges()
 
 	local pcg = rng.pcg32(42, 54)
 
-	local function next(min, max) 
-		return pcg:double_range(min, max)
+	local function next() 
+		return pcg:double_range(2.5, 7.5)
 	end
 
-	assert_double(next(2.5, 7.5), 5.151551102789)
-	assert_double(next(2.5, 7.5), 4.4078333488218)
-	assert_double(next(2.5, 7.5), 5.6350402803242)
-	assert_double(next(2.5, 7.5), 4.5746877718658)
-	assert_double(next(2.5, 7.5), 5.7430168080011)
+	assert_double(next(), 5.151551102789)
+	assert_double(next(), 4.4078333488218)
+	assert_double(next(), 5.6350402803242)
+	assert_double(next(), 4.5746877718658)
+	assert_double(next(), 5.7430168080011)
 
-	assert_double(next(5.5, 5.5), 5.5)
-	assert(not pcall(function() next(7.5, 2.5) end))
+	assert_double(pcg:double_range(5.5, 5.5), 5.5)
+	assert(not pcall(function() pcg:double_range(7.5, 2.5) end))
 end
 
 local function test_pcg32_roll()
@@ -104,8 +110,13 @@ local function test_pcg32_seed()
 	local pcg2 = rng.pcg32(2, 2)
 	local pcg3 = rng.pcg32(2, 2)
 
-	-- checks a pcg32 can be created without specifying seed
+	-- verifies if a pcg32 can be created without specifying seed
 	pcg1:number()
+
+	-- verifies if a pcg32 can be reseeded
+	pcg1:seed(42, 54)
+	check_pcg32_42_54_seed(pcg1)
+	
 	-- checks 2 pcg32 instances with the same seed produce the same results
 	assert(pcg2:number() == pcg3:number())
 	assert(pcg2:number() == pcg3:number())

rng/include/pcg.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <math.h>
+#include <stdio.h>
 
 class Pcg32
 {
@@ -12,8 +13,8 @@ class Pcg32
 
 	~Pcg32() { Release(); }
 
-	void set_seed(uint64_t stat, uint64_t seq) {
-		pcg32_srandom_r(&state, stat, seq);
+	void set_seed(uint64_t stat, uint64_t inc) {
+		pcg32_srandom_r(&state, stat, inc);
 	}
 
 	uint32_t number() {

rng/src/pcg.cpp

@@ -45,18 +45,18 @@ class LuaPcg32 {
 
     static int seed(lua_State *l) {
         Pcg32 *o = checkInstance(l, 1);
-        int state = luaL_optinteger(l, 2, 0);
-        int seq = 0;
+        long state = luaL_optinteger(l, 2, 0);
+        long inc = 0;
 
         if (state == 0) {
             uint64_t* seeds = new_seed();          
             state = seeds[0];
-            seq = seeds[1];        
+            inc = seeds[1];        
         } else {
-            seq = luaL_optinteger(l, 2, 0);
+            inc = luaL_optinteger(l, 3, 0);
         }
-
-        o->set_seed(state, seq);
+                
+        o->set_seed(state, inc);
         return 0;
     }
 
@@ -128,16 +128,18 @@ class LuaPcg32 {
         return 1;        
     }
 
-    static int gc_account(lua_State *L) {
+    static int gc_pcg(lua_State *L) {
         Pcg32 *o = (Pcg32*)lua_unboxpointer(L, 1);
         delete o;
         return 0;
     }
 
     public:
     static void Register(lua_State* L) {
-        lua_newtable(L);                 int methodtable = lua_gettop(L);
-        luaL_newmetatable(L, className); int metatable   = lua_gettop(L);
+        lua_newtable(L);                 
+        int methodtable = lua_gettop(L);
+        luaL_newmetatable(L, className); 
+        int metatable   = lua_gettop(L);
 
         lua_pushliteral(L, "__metatable");
         lua_pushvalue(L, methodtable);
@@ -148,7 +150,7 @@ class LuaPcg32 {
         lua_settable(L, metatable);
 
         lua_pushliteral(L, "__gc");
-        lua_pushcfunction(L, gc_account);
+        lua_pushcfunction(L, gc_pcg);
         lua_settable(L, metatable);
 
         lua_pop(L, 1);  // drop metatable
@@ -166,8 +168,8 @@ class LuaPcg32 {
 
         if (arg_count > 0) {
             long stat = luaL_checknumber(L, 1);
-            long seq = luaL_checknumber(L, 2);
-            o->set_seed(stat, seq);    
+            long inc = luaL_checknumber(L, 2);
+            o->set_seed(stat, inc);    
         }
 
         lua_boxpointer(L, o);
@@ -200,7 +202,6 @@ const luaL_reg LuaPcg32::methods[] = {
     method(LuaPcg32, seed),
     method(LuaPcg32, number),
     { "double", LuaPcg32::double_num },
-    //method(LuaPcg32, double_num),
     method(LuaPcg32, range),
     method(LuaPcg32, double_range),
     method(LuaPcg32, roll),