Changeset 8b3556 in git

Timestamp:

Jun 14, 2010, 9:39:20 AM (14 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

24b338287adc0b77efd774500d1ca7fd85341941

Parents:

b2db66a7980736e09e1b452c311fef4820294e96

Message:

fixed conversion from zz_pEX to CF


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

File:

• factory/NTLconvert.cc (modified) (1 diff)

factory/NTLconvert.cc

@@ -1075 +1075 @@
 }
 
-CanonicalForm convertNTLzz_pEX2CF (zz_pEX f, Variable x, Variable alpha)
-{
-  CanonicalForm bigone= 0;
-  for (int j=0;j<=deg(f);j++)
-  {
-    if (IsOne(coeff(f,j)))
-      bigone+=power(x,j);
-      else
+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)
       {
-        //cout << "hier doof" << "\n";
-        CanonicalForm coefficient=convertNTLzzpE2CF(coeff(f,j),alpha);
-        //cout << "ja" << "\n";
-        if (coeff(f,j)!=0)
-          bigone += (power(x,j)*coefficient);
+        bigone+=(power(x,j)*convertNTLzzpE2CF(coeff(f,j),alpha));
       }
-  }
+    }
+  }
+  else
+  {
+    bigone= convertNTLzzpE2CF(coeff(f,0),alpha);
+    bigone.mapinto();
+  }
+  return bigone;
 }
 //----------------------------------------------------------------------