fix

Fix some bad code Prevent seed == 0
miputra · Dec 7, 2021 · 3fe9767 · 3fe9767
1 parent 0bb0e3e
commit 3fe9767
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/RandEXom/Properties/AssemblyInfo.cs b/RandEXom/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.3.2")]
+[assembly: AssemblyFileVersion("0.1.3.2")]
diff --git a/RandEXom/SeedLib/IterativeSeedR.cs b/RandEXom/SeedLib/IterativeSeedR.cs
@@ -53,7 +53,7 @@ public IterativeSeedR(long ? seed = null)
         {
             long new_seed = 0;
             if (seed == null)
-                new_seed = long.Parse(
+                this._seed = long.Parse(
                     System.DateTime.Now.Millisecond.ToString() +
                     System.DateTime.Now.Second.ToString() +
                     System.DateTime.Now.Minute.ToString() +
@@ -64,11 +64,12 @@ public IterativeSeedR(long ? seed = null)
 
                     );
             else
-                new_seed = (long)seed;
+                this._seed = (long)seed;
             Console.WriteLine("init seed = " + new_seed);
             Console.WriteLine("init seed = " + this.init);
-            currentSeed = _seed;
-            previousSeed = currentSeed;
+            this.currentSeed = _seed;
+            this.currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
+            this.previousSeed = currentSeed;
         }
 
         /// <summary>
@@ -99,7 +100,7 @@ public virtual void Next()
                         );
                     break;
             }
-             
+            currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
         }        
 
     }

diff --git a/RandEXom/SeedLib/IterativeSeedRCustom.cs b/RandEXom/SeedLib/IterativeSeedRCustom.cs
@@ -61,6 +61,9 @@ public IterativeSeedRCustom(Func<long, long> process, long? seed = null)
             else
                 new_seed = (long)seed;
             this._seed = new_seed;
+            this.currentSeed = _seed;
+            this.currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
+            this.previousSeed = currentSeed;
             this.process = process;
         }
 
@@ -69,6 +72,7 @@ public void Next()
             this.previousSeed = currentSeed;
 
             this.currentSeed = process(currentSeed);
+            currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
         }
     }
 }
diff --git a/RandEXom/SeedLib/LCGSeedR.cs b/RandEXom/SeedLib/LCGSeedR.cs
@@ -92,6 +92,7 @@ public LCGSeedR(long? seed = null, long a = 1664525, long c = 1013904223, long m
                 new_seed = (long)seed;
             this._seed = new_seed;
             this.currentSeed = new_seed;
+            this.currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
             this.previousSeed = new_seed;
             this.a = a;
             this.c = c;
@@ -195,7 +196,8 @@ public LCGSeedR(ParameterTemplate template, long ? seed = null)
         public void Next()
         {
             previousSeed = currentSeed;
-            currentSeed = (a * currentSeed + c);            
+            currentSeed = (a * currentSeed + c);
+            currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
         }
     }
 }
diff --git a/RandEXom/SeedLib/SeedR.cs b/RandEXom/SeedLib/SeedR.cs
@@ -54,10 +54,12 @@ public SeedR(long? seed = null)
             else
                 new_seed = (long) seed;
             this._seed = new_seed;
+            this._seed = _seed == 0 ? _seed + 1 : _seed;
         }
 
         public virtual void Next()
         {
+            _seed = _seed == 0 ? _seed + 1 : _seed;
         }
 
 

diff --git a/RandEXom/SeedLib/XORShiftSeed.cs b/RandEXom/SeedLib/XORShiftSeed.cs
@@ -48,6 +48,7 @@ public XORShiftSeed(long? seed = null)
                 new_seed = (long)seed;
             this._seed = new_seed;
             this.currentSeed = new_seed;
+            this.currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
             this.previousSeed = new_seed;
             //this.m = m;
         }
@@ -60,6 +61,7 @@ public virtual void Next()
             c ^= c >> 7;
             c ^= c << 17;
             currentSeed = unchecked((long)c + long.MinValue);
+            currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
         }
     }
 }
diff --git a/RandEXom/SeedLib/XORShiftStarSeed.cs b/RandEXom/SeedLib/XORShiftStarSeed.cs
@@ -27,7 +27,8 @@ public override void Next()
             c ^= c << 25; // b
             c ^= c >> 27; // c
             c = c * 2685821657736338717;
-            currentSeed = unchecked((long)c + long.MinValue);
+            this.currentSeed = unchecked((long)c + long.MinValue);
+            this.currentSeed = currentSeed == 0 ? currentSeed + 1 : currentSeed;
         }
     }
 }