remove incorrect promote(RR,QQ)

Author: pzinn

M2/Macaulay2/m2/reals.m2

@@ -159,6 +159,10 @@ QQ _ ComplexField :=
 RR _ ComplexField :=
 CC _ ComplexField := (x,R) -> toCC(R.precision,x)
 
+lift1 := z -> if z === 0. then 0/1 else if isFinite z then (
+     (prec,sgn,expt,m,numbits) := partsRR z;
+     sgn * m / 2^(numbits - expt)
+     )
 lift(RR,QQ) := opts -> (r,QQ) -> (
      if r == 0 then return 0/1;
      r' := r;
@@ -174,7 +178,7 @@ lift(RR,QQ) := opts -> (r,QQ) -> (
 	  d := m_(1,0);
 	  q := n / d;
 	  if r === numeric(p,q) then return q;
-	  if r' == 0 or abs(n*d) > p2 then return promote(r,QQ);
+	  if r' == 0 or abs(n*d) > p2 then return lift1 r;
 	  r' = 1/r' ;
 	  ))
 lift(RR,ZZ) := opts -> (r,ZZ) -> (
@@ -185,10 +189,6 @@ lift(CC,QQ) := lift(CC,ZZ) := opts -> (z,R) -> (
      if imaginaryPart z == 0 then lift(realPart z, R) 
      else if opts.Verify then error "lift: complex number not real"
      )
-promote(RR,QQ) := (z,QQ) -> if z === 0. then 0/1 else if isFinite z then (
-     (prec,sgn,expt,m,numbits) := partsRR z;
-     sgn * m / 2^(numbits - expt)
-     ) else error "promote(RR,QQ): non-finite number encountered"
 liftable(RRi,QQ) := (z,RR) -> diameter(z) == 0
 liftable(RRi,ZZ) := (z,RR) -> diameter(z) == 0
 lift(RRi,QQ) := opts -> (r,QQ) -> (

M2/Macaulay2/packages/DeterminantalRepresentations.m2

@@ -121,7 +121,7 @@ cubicBivariateDetRep RingElement := List => opts -> f -> (
     L := flatten apply(select(clean(eps, L0), isDoublyStochastic), M -> orthogonalFromOrthostochastic(M, opts));
     if k === QQ then (
         numDigits := ceiling(-log_10(eps));
-        (D1, D2) = (D1/round_numDigits, D2/round_numDigits);
+        (D1, D2) = (D1/round_numDigits/(x->x^QQ), D2/round_numDigits/(x->x^QQ));
         L = L/roundMatrix_numDigits;
     );
     (D1, D2) = (D1, D2)/diagonalMatrix_k;

M2/Macaulay2/packages/LatticePolytopes.m2

@@ -652,7 +652,7 @@ epsilonBounds(Polyhedron,ZZ):=(P,n)->(
 		intInP:=unique(intsect_pos);
 		if (#intInP==2) then(
 		    fVec:=intInP_0-intInP_1;
-		    fv:=gcd(apply(flatten entries(fVec),x->promote(x,QQ)));
+		    fv:=gcd(apply(flatten entries(fVec),x->lift(x,QQ)));
 		    Fvs=append(Fvs,fv);
 		    );
       	    	);

M2/Macaulay2/packages/Macaulay2Doc/changes.m2

@@ -2857,11 +2857,6 @@ document {
 			 "The quotient and remainder for two ring elements can now be obtained simultaneously,
 			 saving time.  See ", TO (quotientRemainder,RingElement,RingElement), "."
 			 },
-		    LI {
-			 "The binary representation of a real number is now available using ", TO (promote,RR,QQ), ".
-			 The code for ", TO (lift,RR,QQ), " has been tightened up so a rational number is provided
-			 that provides exactly the same real number when promoted."
-			 },
 		    LI {
 			 "The Emacs commands ", KBD "M-x M2", ", bound to ", KBD "F12", ", and ", TT "M2-send-to-program",
 			 ", bound to ", KBD "F11", ", have some new capability.

M2/Macaulay2/packages/Macaulay2Doc/functions/lift-doc.m2

@@ -118,19 +118,16 @@ document {
      lift(3.0,QQ)
      ///,
      PARA{
-	  "A continued fraction method is used to lift a real number to a rational number, whereas
-	  ", TO "promote", " uses the internal binary representation.",
+	  "A continued fraction method is used to lift a real number to a rational number."
 	  },
      EXAMPLE lines ///
      lift(123/2341.,QQ)
-     promote(123/2341.,QQ)
      factor oo
      ///,
      PARA { "For numbers and ring elements, an alternate syntax with ", TO "^", " is available,
 	  analogous to the use of ", TO "_", " for ", TO "promote", "." },
      EXAMPLE lines ///
      .0001^QQ
-     .0001_QQ
      ///,
      SeeAlso => { baseRings, promote },
      Subnodes => {

M2/Macaulay2/packages/Macaulay2Doc/functions/promote-doc.m2

@@ -97,8 +97,7 @@ undocumented {(promote,CC,CC_*),
 
 document { 
      Key => {promote,
-	  (symbol _, RingElement, Ring),(symbol _,Number,Ring),
-	  (promote,RR,QQ)},
+	  (symbol _, RingElement, Ring),(symbol _,Number,Ring)},
      Headline => "promote to another ring",
      Usage => "promote(f,R)",
      Inputs => {
@@ -120,17 +119,6 @@ document {
      promote(f,S)
      G = map(S,R); G(f)
      ///,
-     PARA {
-	  "Promotion of real numbers to rational numbers is accomplished by using all of the bits of
-	  the internal representation."
-	  },
-     EXAMPLE lines ///
-     promote(101.,QQ)
-     promote(.101,QQ)
-     factor denominator oo
-     ooo + 0.
-     oo === .101
-     ///,
      PARA {
 	  "For promotion of ring elements, there is the following shorter notation."
 	  },

M2/Macaulay2/packages/Nauty.m2

@@ -247,7 +247,8 @@ generateRandomGraphs (ZZ, ZZ, ZZ) := List => opts -> (n, num, p) -> (
     rndSeed := if instance(opts.RandomSeed, ZZ) then " -S" | toString(opts.RandomSeed % 2^30) else "";
     callNauty("genrang -qg -P" | toString p | " "  | toString n | " " | toString num | rndSeed, {})
 )
-generateRandomGraphs (ZZ, ZZ, QQ) := List => opts -> (n, num, p) -> (
+generateRandomGraphs (ZZ, ZZ, QQ) :=
+generateRandomGraphs (ZZ, ZZ, RR) := List => opts -> (n, num, p) -> (
     if n < 1 then error("generateRandomGraphs: nauty does not like graphs with non-positive numbers of vertices.");
     if num < 1 then return {};
     if p <= 0 or p > 1 then error("generateRandomGraphs: Probability must be between 0 and 1.");
@@ -257,7 +258,6 @@ generateRandomGraphs (ZZ, ZZ, QQ) := List => opts -> (n, num, p) -> (
     q := round(100000000 * p) / 100000000;
     callNauty("genrang -qg -P" | toString q | " "  | toString n | " " | toString num | rndSeed, {})
 )
-generateRandomGraphs (ZZ, ZZ, RR) := List => opts -> (n, num, p) -> generateRandomGraphs(n, num, promote(p, QQ), opts)
 generateRandomGraphs (ZZ, ZZ) := List => opts -> (n, num) -> (
     if n < 1 then error("generateRandomGraphs: nauty does not like graphs with non-positive numbers of vertices.");
     if not instance(opts.RandomSeed, Nothing) and not instance(opts.RandomSeed, ZZ) then error("generateRandomGraphs: Option [RandomSeed] is not a valid type, i.e., ZZ or Nothing.");

M2/Macaulay2/packages/NautyGraphs.m2

@@ -233,7 +233,9 @@ generateRandomGraphs (ZZ, ZZ, ZZ) := List => opts -> (n, num, p) -> (
     rndSeed := if instance(opts.RandomSeed, ZZ) then " -S" | toString(opts.RandomSeed % 2^30) else "";
     callNauty("genrang -qg -P" | toString p | " "  | toString n | " " | toString num | rndSeed, {})
 )
-generateRandomGraphs (ZZ, ZZ, QQ) := List => opts -> (n, num, p) -> (
+
+generateRandomGraphs (ZZ, ZZ, QQ) :=
+generateRandomGraphs (ZZ, ZZ, RR) := List => opts -> (n, num, p) -> (
     if n < 1 then error("generateRandomGraphs: nauty does not like graphs with non-positive numbers of vertices.");
     if num < 1 then return {};
     if p <= 0 or p > 1 then error("generateRandomGraphs: Probability must be between 0 and 1.");
@@ -243,7 +245,6 @@ generateRandomGraphs (ZZ, ZZ, QQ) := List => opts -> (n, num, p) -> (
     q := round(100000000 * p) / 100000000;
     callNauty("genrang -qg -P" | toString q | " "  | toString n | " " | toString num | rndSeed, {})
 )
-generateRandomGraphs (ZZ, ZZ, RR) := List => opts -> (n, num, p) -> generateRandomGraphs(n, num, promote(p, QQ), opts)
 generateRandomGraphs (ZZ, ZZ) := List => opts -> (n, num) -> (
     if n < 1 then error("generateRandomGraphs: nauty does not like graphs with non-positive numbers of vertices.");
     if not instance(opts.RandomSeed, Nothing) and not instance(opts.RandomSeed, ZZ) then error("generateRandomGraphs: Option [RandomSeed] is not a valid type, i.e., ZZ or Nothing.");