Changeset bf29a4 in git

Timestamp:

Dec 21, 2000, 2:22:01 PM (23 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5dab69d5a393466d9560045523c22692fb9c1323

Parents:

bfbc32c19cef318430013cfd78dc6aa9af738067

Message:

MapLongR


git-svn-id: file:///usr/local/Singular/svn/trunk@4970 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• longrat.cc (modified) (4 diffs)
• modulop.cc (modified) (5 diffs)

Singular/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.34 2000-12-15 18:49:32 Singular Exp $ */
+/* $Id: longrat.cc,v 1.35 2000-12-21 13:22:00 pohl Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -121 +121 @@
 }
 
-//static number nlMapLongR(number from);
+static number nlMapLongR(number from);
 static number nlMapR(number from);
 
@@ -139 +139 @@
     return nlMapR;
   }
-//  if (rField_is_long_R(r))
-//  {
-//    nMap = nlMapLongR; /* long R -> Q */
-//    return TRUE;
-//  }
+  if (rField_is_long_R(src))
+  {
+    return nlMapLongR; /* long R -> Q */
+  }
   return NULL;
 }
@@ -279 +278 @@
   nlNormalize(r);
   return r;
+}
+
+static number nlMapLongR(number from)
+{
+  gmp_float *ff=(gmp_float*)from;
+  mpf_t *f=ff->_mpfp();
+  number res;
+  lint *dest,*ndest;
+  int size, i,negative;
+  int e,al,bl;
+  mp_ptr qp,dd,nn;
+
+  size = (*f)[0]._mp_size;
+  if (size == 0)
+    return nlInit(0);
+  if(size<0)
+  {
+    negative = 1;
+    size = -size;
+  }
+  else
+    negative = 0;
+
+  qp = (*f)[0]._mp_d;
+  while(qp[0]==0)
+  {
+    qp++;
+    size--;
+  }
+
+  e=(*f)[0]._mp_exp-size;
+  res = (number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+  res->debug=123456;
+#endif
+  dest = &(res->z);
+
+  if (e<0)
+  {
+    al = dest->_mp_size = size;
+    if (al<2) al = 2;
+    dd = (mp_ptr)omAlloc(sizeof(mp_limb_t)*al);
+    for (i=0;i<size;i++) dd[i] = qp[i];
+    bl = 1-e;
+    nn = (mp_ptr)omAlloc(sizeof(mp_limb_t)*bl);
+    nn[bl-1] = 1;
+    for (i=bl-2;i>=0;i--) nn[i] = 0;
+    ndest = &(res->n);
+    ndest->_mp_d = nn;
+    ndest->_mp_alloc = ndest->_mp_size = bl;
+    res->s = 0;
+  }
+  else
+  {
+    al = dest->_mp_size = size+e;
+    if (al<2) al = 2;
+    dd = (mp_ptr)omAlloc(sizeof(mp_limb_t)*al);
+    for (i=0;i<size;i++) dd[i+e] = qp[i];
+    for (i=0;i<e;i++) dd[i] = 0;
+    res->s = 3;
+  }
+
+  dest->_mp_d = dd;
+  dest->_mp_alloc = al;
+  if (negative) dest->_mp_size = -dest->_mp_size;
+
+  if (res->s==0)
+    nlNormalize(res);
+  else if (mpz_size1(&res->z)<=MP_SMALL)
+  {
+    int ui=(int)mpz_get_si(&res->z);
+    if ((((ui<<3)>>3)==ui)
+       && (mpz_cmp_si(&res->z,(long)ui)==0))
+    {
+       mpz_clear(&res->z);
+       omFreeBin((ADDRESS)res, rnumber_bin);
+       return INT_TO_SR(ui);
+    }
+  }
+#if defined(LDEBUG)
+  nlTest(res);
+#endif
+  return res;
 }
 

Singular/modulop.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.cc,v 1.23 2000-12-15 18:49:34 Singular Exp $ */
+/* $Id: modulop.cc,v 1.24 2000-12-21 13:22:01 pohl Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -15 +15 @@
 #include "numbers.h"
 #include "longrat.h"
+#include "mpr_complex.h"
 #include "ring.h"
 #include "modulop.h"
@@ -289 +290 @@
 }
 
-
 #ifdef LDEBUG
 BOOLEAN npDBTest (number a, char *f, int l)
@@ -316 +316 @@
   i%=npPrimeM;
   return (number)i;
+}
+
+static number npMapLongR(number from)
+{
+  gmp_float *ff=(gmp_float*)from;
+  mpf_t *f=ff->_mpfp();
+  number res;
+  lint *dest,*ndest;
+  int size,i;
+  int e,al,bl,iz,in;
+  mp_ptr qp,dd,nn;
+
+  size = (*f)[0]._mp_size;
+  if (size == 0)
+    return npInit(0);
+  if(size<0)
+    size = -size;
+
+  qp = (*f)[0]._mp_d;
+  while(qp[0]==0)
+  {
+    qp++;
+    size--;
+  }
+
+  if(npPrimeM>2)
+    e=(*f)[0]._mp_exp-size;
+  else
+    e=0;
+  res = (number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG)
+  res->debug=123456;
+#endif
+  dest = &(res->z);
+
+  if (e<0)
+  {
+    al = dest->_mp_size = size;
+    if (al<2) al = 2;
+    dd = (mp_ptr)omAlloc(sizeof(mp_limb_t)*al);
+    for (i=0;i<size;i++) dd[i] = qp[i];
+    bl = 1-e;
+    nn = (mp_ptr)omAlloc(sizeof(mp_limb_t)*bl);
+    nn[bl-1] = 1;
+    for (i=bl-2;i>=0;i--) nn[i] = 0;
+    ndest = &(res->n);
+    ndest->_mp_d = nn;
+    ndest->_mp_alloc = ndest->_mp_size = bl;
+    res->s = 0;
+    in=mpz_mmod_ui(NULL,ndest,npPrimeM);
+    mpz_clear(ndest);
+  }
+  else
+  {
+    al = dest->_mp_size = size+e;
+    if (al<2) al = 2;
+    dd = (mp_ptr)omAlloc(sizeof(mp_limb_t)*al);
+    for (i=0;i<size;i++) dd[i+e] = qp[i];
+    for (i=0;i<e;i++) dd[i] = 0;
+    res->s = 3;
+  }
+
+  dest->_mp_d = dd;
+  dest->_mp_alloc = al;
+  iz=mpz_mmod_ui(NULL,dest,npPrimeM);
+  mpz_clear(dest);
+  omFreeBin((ADDRESS)res, rnumber_bin);
+  if(res->s==0)
+    iz=(int)npDiv((number)iz,(number)in);
+  return (number)iz;
 }
 
@@ -336 +406 @@
     }
   }
+  if (rField_is_long_R(src))
+  {
+    return npMapLongR;
+  }
   return NULL;      /* default */
 }