Changeset 371bc5f in git

Timestamp:

May 5, 2010, 4:48:16 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

1039061756503fcd51dbb38bc4aabb902c4933c7

Parents:

d0a51ee4394b5f223004bd691b3fd91403cea0a1

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-05 16:48:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:51:41+01:00

Message:

maps for Q

Location:

coeffs

Files:

• longrat.cc (modified) (7 diffs)
• numbers.cc (modified) (1 diff)

coeffs/longrat.cc

@@ -140 +140 @@
 #endif
 
-static coeffs nlMapRing;
-static number nlMapP(number from, const coeffs r)
+static number nlMapP(number from, const coeffs src, const coeffs r)
 {
   number to;
-  to = nlInit(npInt(from,nlMapRing), r);
+  to = nlInit(npInt(from,src), r);
   return to;
 }
@@ -184 +183 @@
 #endif
 
-nMapFunc nlSetMap(const coeffs src, const coeffs dst)
-{
-  if (rField_is_Q(src))
-  {
-    return nlCopy;
-  }
-  nlMapRing=src;
-  if (rField_is_Zp(src))
-  {
-    return nlMapP;
-  }
-  if (rField_is_R(src))
-  {
-    return nlMapR;
-  }
-  if (rField_is_long_R(src))
-  {
-    return nlMapLongR; /* long R -> Q */
-  }
-#ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(src) || rField_is_Ring_PtoM(src) || rField_is_Ring_ModN(src))
-  {
-    return nlMapGMP;
-  }
-  if (rField_is_Ring_2toM(src))
-  {
-    return nlMapMachineInt;
-  }
-#endif
-  return NULL;
-}
 
 #ifdef LDEBUG
@@ -297 +265 @@
 number nlRInit (long i);
 
-static number nlMapR(number from, const coeffs r)
+static number nlMapR(number from, const coeffs src, const coeffs dst)
 {
   double f=nrFloat(from);
@@ -320 +288 @@
   memcpy(&(re->n),&h1,sizeof(h1));
   re->s=0; /* not normalized */
-  if(f_sign==-1) re=nlNeg(re,r);
-  nlNormalize(re,r);
+  if(f_sign==-1) re=nlNeg(re,dst);
+  nlNormalize(re,dst);
   return re;
 }
 
-static number nlMapLongR(number from, const coeffs r) 
+static number nlMapLongR(number from, const coeffs src, const coeffs dst) 
 {
   gmp_float *ff=(gmp_float*)from;
@@ -390 +358 @@
 
   if (res->s==0)
-    nlNormalize(res,r);
+    nlNormalize(res,dst);
   else if (mpz_size1(&res->z)<=MP_SMALL)
   {
@@ -1221 +1189 @@
     int in=mpz_fdiv_ui(n->n,(unsigned long)p);
     #ifdef NV_OPS
-    if (npPrimeM>NV_MAX_PRIME)
+    if (p>NV_MAX_PRIME)
     return (int)((long)nvDiv((number)iz,(number)in,(const coeffs)r));
     #endif
@@ -1923 +1891 @@
 
 /*2
+* copy a to b for ampping
+*/
+number nlCopyMap(number a, const coeffs rc, const coeffs r)
+{
+  if ((SR_HDL(a) & SR_INT)||(a==NULL))
+  {
+    return a;
+  }
+  return _nlCopy_NoImm(a);
+}
+nMapFunc nlSetMap(const coeffs src, const coeffs dst)
+{
+  if (nField_is_Q(src))
+  {
+    return nlCopyMap;
+  }
+  if (nField_is_Zp(src))
+  {
+    return nlMapP;
+  }
+  if (nField_is_R(src))
+  {
+    return nlMapR;
+  }
+  if (nField_is_long_R(src))
+  {
+    return nlMapLongR; /* long R -> Q */
+  }
+#ifdef HAVE_RINGS
+  if (nField_is_Ring_Z(src) || nField_is_Ring_PtoM(src) || nField_is_Ring_ModN(src))
+  {
+    return nlMapGMP;
+  }
+  if (nField_is_Ring_2toM(src))
+  {
+    return nlMapMachineInt;
+  }
+#endif
+  return NULL;
+}
+/*2
 * z := i
 */

coeffs/numbers.cc

@@ -11 +11 @@
 #include <stdlib.h>
 #include "coeffs.h"
+#include "output.h"
+#include "omalloc.h"
 #include "numbers.h"
 #include "longrat.h"
-#include "longalg.h"
 #include "modulop.h"
 #include "gnumpfl.h"