Raise an error in random(QQ) if height is nonpositive

Macaulay2 · Sep 22, 2024 · 7fabcd3 · 7fabcd3
1 parent 82aabfe
commit 7fabcd3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/M2/Macaulay2/d/interface.dd b/M2/Macaulay2/d/interface.dd
@@ -66,8 +66,7 @@ export rawFareyApproximation(e:Expr):Expr := (
 setupfun("rawFareyApproximation", rawFareyApproximation);
 export rawRandomQQ(e:Expr):Expr := (
      when e
-     is Nothing do toExpr(Ccode(QQ, "rawRandomQQ(", "0)"))
-     is ht:ZZcell do toExpr(Ccode(QQ, "rawRandomQQ(", ht.v, ")"))
+     is ht:ZZcell do toExpr(Ccode(QQorNull, "rawRandomQQ(", ht.v, ")"))
      else WrongArgZZ());
 setupfun("rawRandomQQ",rawRandomQQ);
 export rawRandomRRUniform(e:Expr):Expr := (

diff --git a/M2/Macaulay2/e/interface/random.cpp b/M2/Macaulay2/e/interface/random.cpp
@@ -3,6 +3,9 @@
 #include "interface/random.h"
 #include "interface/gmp-util.h"
 
+#include "exceptions.hpp"
+#include "error.h"
+
 #define INITIALMAXINT 10
 
 #define IA 16807
@@ -152,6 +155,9 @@ void rawSetRandomQQ(mpq_ptr result, gmp_ZZ height)
   mpfr_t x;
 
   if (height == nullptr) height = maxHeight;
+  if (mpz_cmp_si(height, 0) <= 0)
+    throw exc::engine_error("expected a positive height");
+
   mpfr_init2(x, gmp_defaultPrecision);
   mpfr_urandomb(x, state);
   mpfr_mul_z(x, x, height, MPFR_RNDN);
@@ -165,7 +171,14 @@ gmp_QQ rawRandomQQ(gmp_ZZ height)
 {
   mpq_ptr result = getmemstructtype(mpq_ptr);
   mpq_init(result);
-  rawSetRandomQQ(result, height);
+
+  try {
+    rawSetRandomQQ(result, height);
+  } catch (const exc::engine_error& e) {
+    ERROR(e.what());
+    return nullptr;
+  }
+
   return moveTo_gmpQQ(result);
 }
 

diff --git a/M2/Macaulay2/e/matrix.cpp b/M2/Macaulay2/e/matrix.cpp
@@ -745,7 +745,12 @@ Matrix *Matrix::random(
                 int32_t u = rawRandomInt((int32_t)10000);
                 if (u > threshold) continue;
               }
-            mat.set_entry(j, i, R->random());
+            try {
+              mat.set_entry(j, i, R->random());
+            } catch (const exc::engine_error& e) {
+              ERROR(e.what());
+              return nullptr;
+            }
           }
     }
   else if (special_type == 1)
@@ -760,7 +765,12 @@ Matrix *Matrix::random(
                   int32_t u = rawRandomInt((int32_t)10000);
                   if (u > threshold) continue;
                 }
-              mat.set_entry(j, i, R->random());
+              try {
+                mat.set_entry(j, i, R->random());
+              } catch (const exc::engine_error& e) {
+                ERROR(e.what());
+                return nullptr;
+              }
             }
         }
     }