RandomNumberEngine: changed the return types of max() and min()

Author: stephengold

src/main/java/com/github/stephengold/joltjni/std/DefaultRandomEngine.java

@@ -61,26 +61,28 @@ public DefaultRandomEngine(int seed) {
     /**
      * Return the maximum value that can be generated.
      *
-     * @return the maximum value
+     * @return an unsigned 32-bit value
      */
     @Override
-    public int max() {
+    public long max() {
         long generatorVa = va();
-        int result = max(generatorVa);
+        long result = max(generatorVa);
 
+        assert result >= 0L : result;
         return result;
     }
 
     /**
      * Return the minimum value that can be generated.
      *
-     * @return the minimum value
+     * @return an unsigned 32-bit value
      */
     @Override
-    public int min() {
+    public long min() {
         long generatorVa = va();
-        int result = min(generatorVa);
+        long result = min(generatorVa);
 
+        assert result >= 0L : result;
         return result;
     }
 
@@ -130,9 +132,9 @@ public void seed(int value) {
 
     native private static void free(long generatorVa);
 
-    native private static int max(long generatorVa);
+    native private static long max(long generatorVa);
 
-    native private static int min(long generatorVa);
+    native private static long min(long generatorVa);
 
     native private static int nextInt(long generatorVa);
 

src/main/java/com/github/stephengold/joltjni/std/Mt19937.java

@@ -59,26 +59,28 @@ public Mt19937(int seed) {
     /**
      * Return the maximum value that can be generated.
      *
-     * @return the maximum value
+     * @return an unsigned 32-bit value
      */
     @Override
-    public int max() {
+    public long max() {
         long generatorVa = va();
-        int result = max(generatorVa);
+        long result = max(generatorVa);
 
+        assert result >= 0L : result;
         return result;
     }
 
     /**
      * Return the minimum value that can be generated.
      *
-     * @return the minimum value
+     * @return an unsigned 32-bit value
      */
     @Override
-    public int min() {
+    public long min() {
         long generatorVa = va();
-        int result = min(generatorVa);
+        long result = min(generatorVa);
 
+        assert result >= 0L : result;
         return result;
     }
 
@@ -128,9 +130,9 @@ public void seed(int value) {
 
     native private static void free(long generatorVa);
 
-    native private static int max(long generatorVa);
+    native private static long max(long generatorVa);
 
-    native private static int min(long generatorVa);
+    native private static long min(long generatorVa);
 
     native private static int nextInt(long generatorVa);
 

src/main/java/com/github/stephengold/joltjni/std/RandomNumberEngine.java

@@ -35,16 +35,16 @@ public interface RandomNumberEngine extends ConstJoltPhysicsObject {
     /**
      * Return the maximum value that can be generated.
      *
-     * @return the maximum value
+     * @return an unsigned 32-bit value
      */
-    int max();
+    long max();
 
     /**
      * Return the minimum value that can be generated.
      *
-     * @return the minimum value
+     * @return an unsigned 32-bit value
      */
-    int min();
+    long min();
 
     /**
      * Return the next integer in the sequence.

src/main/native/glue/d/DefaultRandomEngine.cpp

@@ -60,9 +60,9 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngi
 /*
  * Class:     com_github_stephengold_joltjni_std_DefaultRandomEngine
  * Method:    max
- * Signature: (J)I
+ * Signature: (J)J
  */
-JNIEXPORT jint JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngine_max
+JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngine_max
   (JNIEnv *, jclass, jlong generatorVa) {
     default_random_engine * const pGenerator
             = reinterpret_cast<default_random_engine *> (generatorVa);
@@ -73,9 +73,9 @@ JNIEXPORT jint JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngi
 /*
  * Class:     com_github_stephengold_joltjni_std_DefaultRandomEngine
  * Method:    min
- * Signature: (J)I
+ * Signature: (J)J
  */
-JNIEXPORT jint JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngine_min
+JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_std_DefaultRandomEngine_min
   (JNIEnv *, jclass, jlong generatorVa) {
     default_random_engine * const pGenerator
             = reinterpret_cast<default_random_engine *> (generatorVa);

src/main/native/glue/m/Mt19937.cpp

@@ -60,24 +60,24 @@ JNIEXPORT void JNICALL Java_com_github_stephengold_joltjni_std_Mt19937_free
 /*
  * Class:     com_github_stephengold_joltjni_std_Mt19937
  * Method:    max
- * Signature: (J)I
+ * Signature: (J)J
  */
-JNIEXPORT jint JNICALL Java_com_github_stephengold_joltjni_std_Mt19937_max
+JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_std_Mt19937_max
   (JNIEnv *, jclass, jlong generatorVa) {
     const mt19937 * const pGenerator = reinterpret_cast<mt19937 *> (generatorVa);
-    const jint result = pGenerator->max();
+    const mt19937::result_type result = pGenerator->max();
     return result;
 }
 
 /*
  * Class:     com_github_stephengold_joltjni_std_Mt19937
  * Method:    min
- * Signature: (J)I
+ * Signature: (J)J
  */
-JNIEXPORT jint JNICALL Java_com_github_stephengold_joltjni_std_Mt19937_min
+JNIEXPORT jlong JNICALL Java_com_github_stephengold_joltjni_std_Mt19937_min
   (JNIEnv *, jclass, jlong generatorVa) {
     const mt19937 * const pGenerator = reinterpret_cast<mt19937 *> (generatorVa);
-    const jint result = pGenerator->min();
+    const mt19937::result_type result = pGenerator->min();
     return result;
 }