Changeset 102daa in git


Ignore:
Timestamp:
Apr 22, 2013, 4:32:37 PM (9 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5bec8f88c9ee2573d328cf7c3aff2bcb301d2395')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/cfNewtonPolygon.cc

    r6fcd65b r102daa  
    2323#include "templates/ftmpl_functions.h"
    2424#include "algext.h"
    25 
    26 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
    2725
    2826static
     
    923921  CanonicalForm g= gcd (newtonPolyg[0][0], newtonPolyg[0][1]); //maybe it's better to use plain intgcd
    924922
    925 
    926   printf ("newtonPolyg[0]= %d\n", newtonPolyg[0][0]);
    927   printf ("newtonPolyg[0]= %d\n", newtonPolyg[0][1]);
    928   out_cf ("g= ", g, "\n");
    929 
    930923  int i= 1;
    931924  while (!g.isOne() && i < sizeOfNewtonPolygon)
     
    933926    g= gcd (g, newtonPolyg[i][0]);
    934927    g= gcd (g, newtonPolyg[i][1]);
    935   printf ("newtonPolyg[i]= %d\n", newtonPolyg[i][0]);
    936   printf ("newtonPolyg[i]= %d\n", newtonPolyg[i][1]);
    937     out_cf ("g= ", g, "\n");
    938928    i++;
    939929  }
     
    10391029  ASSERT (factorize (F).length() <= 2, " expected irreducible polynomial");
    10401030
    1041   out_cf ("F= ", F, "\n");
    10421031  bool isRat= isOn (SW_RATIONAL);
    10431032  if (isRat)
     
    10641053  Fp= Fp (y+E[2], y);
    10651054
    1066   out_cf ("Fp0= ", Fp, "\n");
    1067 
    10681055  if (tdeg == totaldegree (Fp))
    10691056  {
     
    10731060      if (factors.length() == 2 && factors.getLast().exp() == 1)
    10741061      {
    1075         printf ("irred1\n");
    10761062        if (isRat)
    10771063          On (SW_RATIONAL);
     
    10871073  Fp= Fp (y+E[2], y);
    10881074
    1089   out_cf ("Fp1= ", Fp, "\n");
    1090 
    10911075  if (tdeg == totaldegree (Fp))
    10921076  {
     
    10961080      if (factors.length() == 2 && factors.getLast().exp() == 1)
    10971081      {
    1098         printf ("irred2\n");
    10991082        if (isRat)
    11001083          On (SW_RATIONAL);
     
    11261109          if (factors.length() == 2 && factors.getLast().exp() == 1)
    11271110          {
    1128             out_cf ("Fp2= ", Fp, "\n");
    1129             printf ("tdeg= %d\n", tdeg);
    1130             printf ("totaldegree (Fp)= %d\n", totaldegree (Fp));
    1131             printf ("degree (Fp, 1)= %d\n", degree (Fp,1));
    1132             printf ("degree (Fp,2)= %d\n", degree (Fp,2));
    1133             printf ("degree (F,1)= %d\n", degree (F,1));
    1134             printf ("degree (F,2)= %d\n", degree (F,2));
    1135             out_cf ("factors.getFirst()= ", factors.getFirst().factor(), "\n");
    1136             printf ("char= %d\n", getCharacteristic ());
    1137             printf ("irred3\n");
    11381111            if (isRat)
    11391112              On (SW_RATIONAL);
Note: See TracChangeset for help on using the changeset viewer.