Changeset c729f2 in git for factory/NTLconvert.cc

Timestamp:

Mar 5, 2012, 10:05:50 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

47dc5eae8e5fa15711c4af64c3ce91a844425401

Parents:

b78a13dc05baa2440a909f8b9174e8b4491d56cc

git-author:

Martin Lee <martinlee84@web.de>2012-03-05 22:05:50+01:00

git-committer:

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

Message:

chg: conversion to NTL ZZ_pX now allows non-word size p
chg: added conversion of NTL ZZ_pEX to CanonicalForm and back

File:

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

factory/NTLconvert.cc

@@ -84 +84 @@
     NTLcurrentExp=i.exp();
 
-    CanonicalForm c=i.coeff();
-    if (!c.isImm()) c=c.mapinto(); //c%= getCharacteristic();
-    if (!c.isImm())
-    {  //This case will never happen if the characteristic is in fact a prime
-       // number, since all coefficients are represented as immediates
-       #ifndef NOSTREAMIO
-       cout<<"convertFacCF2NTLZZ_pX: coefficient not immediate! : "<<f<<"\n";
-       #else
-       //NTL_SNS
-       printf("convertFacCF2NTLZZ_pX: coefficient not immediate!, char=%d\n",
-              getCharacteristic());
-       #endif
-       NTL_SNS exit(1);
-    }
-    else
-    {
-      SetCoeff(ntl_poly,NTLcurrentExp,c.intval());
-    }
+    SetCoeff(ntl_poly,NTLcurrentExp,to_ZZ_p (convertFacCF2NTLZZ (i.coeff())));
     NTLcurrentExp--;
   }
@@ -265 +248 @@
 CanonicalForm convertNTLZZpX2CF(ZZ_pX poly,Variable x)
 {
-  //printf("convertNTLZZpX2CF\n");
-  CanonicalForm bigone;
-
-
-  if (deg(poly)>0)
-  {
-    // poly is non-constant
-    bigone=0;
-    bigone.mapinto();
-    // Compute the canonicalform coefficient by coefficient,
-    // bigone summarizes the result.
-    for (int j=0;j<=deg(poly);j++)
-    {
-      if (coeff(poly,j)!=0)
-      {
-        bigone+=(power(x,j)*CanonicalForm(to_long(rep(coeff(poly,j)))));
-      }
-    }
-  }
-  else
-  {
-    // poly is immediate
-    bigone=CanonicalForm(to_long(rep(coeff(poly,0))));
-    bigone.mapinto();
-  }
-  return bigone;
+  return convertNTLZZX2CF (to_ZZX (poly), x);
 }
 
@@ -1145 +1103 @@
   return bigone;
 }
+
+CanonicalForm convertNTLZZ_pEX2CF (ZZ_pEX f, Variable x, Variable alpha)
+{
+  CanonicalForm bigone;
+  if (deg (f) > 0)
+  {
+    bigone= 0;
+    bigone.mapinto();
+    for (int j=0;j<deg(f)+1;j++)
+    {
+      if (coeff(f,j)!=0)
+      {
+        bigone+=(power(x,j)*convertNTLZZpE2CF(coeff(f,j),alpha));
+      }
+    }
+  }
+  else
+  {
+    bigone= convertNTLZZpE2CF(coeff(f,0),alpha);
+    bigone.mapinto();
+  }
+  return bigone;
+}
 //----------------------------------------------------------------------
 mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(CFMatrix &m)