Changeset 102daa in git

Timestamp:

Apr 22, 2013, 4:32:37 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e1a22119c89dfbc8533ea4d335f2fa9ee5ec9811

Parents:

6fcd65b41235516be599e23554d96064636cb46c

git-author:

Martin Lee <martinlee84@web.de>2013-04-22 16:32:37+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-05-02 11:42:41+02:00

Message:

chg: more clean up

File:

• factory/cfNewtonPolygon.cc (modified) (9 diffs)

factory/cfNewtonPolygon.cc

@@ -23 +23 @@
 #include "templates/ftmpl_functions.h"
 #include "algext.h"
-
-void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 
 static
@@ -923 +921 @@
   CanonicalForm g= gcd (newtonPolyg[0][0], newtonPolyg[0][1]); //maybe it's better to use plain intgcd
 
-
-  printf ("newtonPolyg[0]= %d\n", newtonPolyg[0][0]);
-  printf ("newtonPolyg[0]= %d\n", newtonPolyg[0][1]);
-  out_cf ("g= ", g, "\n");
-
   int i= 1;
   while (!g.isOne() && i < sizeOfNewtonPolygon)
@@ -933 +926 @@
     g= gcd (g, newtonPolyg[i][0]);
     g= gcd (g, newtonPolyg[i][1]);
-  printf ("newtonPolyg[i]= %d\n", newtonPolyg[i][0]);
-  printf ("newtonPolyg[i]= %d\n", newtonPolyg[i][1]);
-    out_cf ("g= ", g, "\n");
     i++;
   }
@@ -1039 +1029 @@
   ASSERT (factorize (F).length() <= 2, " expected irreducible polynomial");
 
-  out_cf ("F= ", F, "\n");
   bool isRat= isOn (SW_RATIONAL);
   if (isRat)
@@ -1064 +1053 @@
   Fp= Fp (y+E[2], y);
 
-  out_cf ("Fp0= ", Fp, "\n");
-
   if (tdeg == totaldegree (Fp))
   {
@@ -1073 +1060 @@
       if (factors.length() == 2 && factors.getLast().exp() == 1)
       {
-        printf ("irred1\n");
         if (isRat)
           On (SW_RATIONAL);
@@ -1087 +1073 @@
   Fp= Fp (y+E[2], y);
 
-  out_cf ("Fp1= ", Fp, "\n");
-
   if (tdeg == totaldegree (Fp))
   {
@@ -1096 +1080 @@
       if (factors.length() == 2 && factors.getLast().exp() == 1)
       {
-        printf ("irred2\n");
         if (isRat)
           On (SW_RATIONAL);
@@ -1126 +1109 @@
           if (factors.length() == 2 && factors.getLast().exp() == 1)
           {
-            out_cf ("Fp2= ", Fp, "\n");
-            printf ("tdeg= %d\n", tdeg);
-            printf ("totaldegree (Fp)= %d\n", totaldegree (Fp));
-            printf ("degree (Fp, 1)= %d\n", degree (Fp,1));
-            printf ("degree (Fp,2)= %d\n", degree (Fp,2));
-            printf ("degree (F,1)= %d\n", degree (F,1));
-            printf ("degree (F,2)= %d\n", degree (F,2));
-            out_cf ("factors.getFirst()= ", factors.getFirst().factor(), "\n");
-            printf ("char= %d\n", getCharacteristic ());
-            printf ("irred3\n");
             if (isRat)
               On (SW_RATIONAL);