Skip to content

Commit 1aaa5f3

Browse files
committed
fix isPromotable ring family
1 parent 680e2ab commit 1aaa5f3

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

M2/Macaulay2/m2/reals.m2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,13 @@ promote(RawRingElement,RingElement) := (x,R) -> new R from x
106106
promote(Number,InexactNumber) := (x,RR) -> promote(x,default RR)
107107
promote(ZZ,RR') :=
108108
promote(QQ,RR') :=
109+
promote(RR',RR') :=
109110
promote(RR,RR') := (i,K) -> toRR(K.precision,i)
110111
promote(ZZ,CC') :=
111112
promote(QQ,CC') :=
112113
promote(RR,CC') :=
114+
promote(RR',CC') :=
115+
promote(CC',CC') :=
113116
promote(CC,CC') := (i,K) -> toCC(K.precision,i)
114117
promote(ZZ,RRi') :=
115118
promote(QQ,RRi') :=

M2/Macaulay2/m2/typicalvalues.m2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,12 @@ taylor (log1p, (x,n) -> (
319319
s
320320
))
321321

322+
promote(RR',RR') :=
323+
promote(RR',CC') :=
324+
promote(CC',CC') :=
325+
promote(RR',CC') :=
326+
promote(RR',RRi') :=
327+
promote(RRi',RRi') := dummy
322328

323329
-- Local Variables:
324330
-- compile-command: "make -C $M2BUILDDIR/Macaulay2/m2 "

0 commit comments

Comments
 (0)