From 29ba81d28831a66d41fb3376d2d825311698c096 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Mon, 21 Apr 2025 06:20:25 -0400 Subject: [PATCH] Add "ZZ ZZ" method to Units so it doesn't conflict w/ Brackets If we loaded Brackets before Units, then the definition of "circle" gave us an error because "radian 2" gave us [1, 2] instead of 1 * 2. --- M2/Macaulay2/packages/Units.m2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/M2/Macaulay2/packages/Units.m2 b/M2/Macaulay2/packages/Units.m2 index 07bb94d4bc4..53bbd743f9b 100644 --- a/M2/Macaulay2/packages/Units.m2 +++ b/M2/Macaulay2/packages/Units.m2 @@ -56,7 +56,7 @@ Measurement ^ ZZ := (m,i) -> if i === 0 then 1 else new Measurement from {m#0^i, Measurement + Measurement := (m,n) -> ( if m#1 =!= n#1 then error "sum: incompatible measurements"; new Measurement from { m#0 + n#0 , m#1 } ) Measurement - Measurement := (m,n) -> m + -n -Constant Number := Number Constant := Number Number := times +Constant Number := Number Constant := Number Number := ZZ ZZ := times exa = 10^18 peta = 10^15