Changeset 2b76ff in git for factory/NTLconvert.cc

Timestamp:

Feb 28, 2012, 12:05:03 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '7725b5cfc1eaf99630826ecc59f559d3b6831c24')

Children:

67ed7453c29d77d1c838dfcc5a2cc5ad7b629695

Parents:

f89fed03fe4889f0b8358d3a5166851c2e87ad50

git-author:

Martin Lee <martinlee84@web.de>2012-02-28 12:05:03+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:26+02:00

Message:

chg: conversion of NTL ZZ to CanonicalForm

File:

• factory/NTLconvert.cc (modified) (2 diffs)

factory/NTLconvert.cc

@@ -532 +532 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-static char *cf_stringtemp;
+static unsigned char *cf_stringtemp;
+static unsigned long cf_stringtemp_l=0L;
+CanonicalForm
+convertZZ2CF (ZZ a)
+{
+  long coeff_long=to_long(a);
+
+  CanonicalForm result;
+  if ( (NumBits(a)<((long)NTL_ZZ_NBITS))
+  && (coeff_long>((long)MINIMMEDIATE))
+  && (coeff_long<((long)MAXIMMEDIATE)))
+  {
+    return CanonicalForm(coeff_long);
+  }
+  else
+  {
+    long sizeofrep= ((long *) a.rep) [1];
+    bool lessZero= false;
+    if (sizeofrep < 0)
+    {
+      lessZero= true;
+      sizeofrep= -sizeofrep;
+    }
+    if (cf_stringtemp_l == 0)
+    {
+      cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
+      cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
+    }
+    else if (cf_stringtemp_l < sizeofrep*sizeof(mp_limb_t)*2)
+    {
+      Free (cf_stringtemp, cf_stringtemp_l);
+      cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
+      cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
+    }
+    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep);
+
+    char* cf_stringtemp2;
+    if (lessZero)
+    {
+      cf_stringtemp2= new char [cc + 2];
+      cf_stringtemp2[0]='-';
+      for (int j= 1; j <= cc; j++)
+        cf_stringtemp2[j]= IntValToChar ((int) cf_stringtemp [j-1]);
+      cf_stringtemp2[cc+1]='\0';
+    }
+    else
+    {
+      cf_stringtemp2= new char [cc + 1];
+      for (int j= 0; j < cc; j++)
+        cf_stringtemp2[j]= IntValToChar ((int) cf_stringtemp [j]);
+      cf_stringtemp2[cc]='\0';
+    }
+
+    result= CanonicalForm (cf_stringtemp2, 16);
+    delete [] cf_stringtemp2;
+    return result;
+  }
+  return result;
+}
+
+/*static char *cf_stringtemp;
 static char *cf_stringtemp2;
 static int cf_stringtemp_l=0;
@@ -629 +689 @@
   return CanonicalForm(cf_stringtemp2,16);
   //return tmp;
-}
+}*/
 
 ////////////////////////////////////////////////////////////////////////////////