Changeset f5d2963 in git

Timestamp:

Oct 28, 2009, 3:52:40 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

7d60f7ef29be846d8ebb02dd71d5c04294bc7831

Parents:

c48e808503cec7132527760979f9671dda451da8

Message:

*lee: new gcd


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

Location:

factory

Files:

• NTLconvert.cc (modified) (2 diffs)
• cf_gcd_charp.cc (modified) (7 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.26 2009-06-04 17:50:49 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.27 2009-10-28 14:51:26 Singular Exp $ */
 #include <config.h>
 
@@ -1102 +1102 @@
   return result;
 }
+
+CanonicalForm convertNTLzz_pEX2CF (zz_pEX f, Variable x, Variable alpha)
+{
+  CanonicalForm bigone= 0;
+  for (int j=0;j<deg(f)+1;j++)
+  {
+    if (IsOne(coeff(f,j)))
+      bigone+=power(x,j);
+      else
+      {
+        //cout << "hier doof" << "\n";
+        CanonicalForm coefficient=convertNTLzzpE2CF(coeff(f,j),alpha);
+        //cout << "ja" << "\n";
+        if (coeff(f,j)!=0)
+          bigone += (power(x,j)*coefficient);
+      }
+  }
+}
 #endif

factory/cf_gcd_charp.cc

@@ -176 +176 @@
   CanonicalForm interPoly;
 
-  interPoly = oldInterPoly + (u - oldInterPoly(alpha, x)) / newtonPoly(alpha, x) * newtonPoly;
-
+  interPoly = oldInterPoly + ((u - oldInterPoly(alpha, x)) / newtonPoly(alpha, x)) * newtonPoly;
+  /*cout << "newtonPoly (alpha,x)= " << newtonPoly (alpha,x) << "\n";
+  cout << "1/newtonPoly (alpha,x)= " << 1/newtonPoly (alpha,x) << "\n";
+  cout << "newtonPoly (alpha,x)*(1/newtonPoly (alpha,x))= " << newtonPoly (alpha,x)*(1/newtonPoly (alpha,x)) << "\n";*/
   //if(debug)cout << "newtonInterpIncremental output:" << interPoly << endl;
   return interPoly;
@@ -219 +221 @@
   }
   //if(debug == 1)cout << "simpleGCD output: " << P1 << endl;
-  return(P1);
+  return(P1/lc(P1));
 }
 
@@ -230 +232 @@
   CanonicalForm result = 0;
   int i, j;
-  int fieldSize = (int)pow(getCharacteristic(), getGFDegree());
+  int fieldSize = (int) ::pow(getCharacteristic(), getGFDegree());
   CanonicalForm g;
   for(i = 0; i <= degree(A); i++)
@@ -351 +353 @@
   {
     k=getGFDegree();
-    fieldSize = (int)pow(p, k);
+    fieldSize = (int) ::pow(p, k);
   }
 
@@ -508 +510 @@
       }
       int expon = 2; // expon <= will not extend the field
-      while(pow(fieldSize, expon) < degMax)
+      while(::pow(fieldSize, expon) < degMax)
       {
         expon++;
@@ -515 +517 @@
       if(k > 1)
       {
-        if(pow(p,k * expon) < (1<<16))
+        if(::pow(p,k * expon) < (1<<16))
         {
           setCharacteristic(p, k * expon, 'b');
@@ -539 +541 @@
       else
       {
-        if(pow(p,k * expon) < (1<<16))
+        if(::pow(p,k * expon) < (1<<16))
         {
           setCharacteristic(p, k * expon, 'a');