Changeset b17fa5 in git for factory/facAlgFuncUtil.cc

Timestamp:

May 9, 2014, 10:54:58 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

abde36b449ab6a0f2a38cfd641d669db6be6a1b9

Parents:

5a06b22d913c4ebbbafbc22723d9ebfed2f0c830

git-author:

Martin Lee <martinlee84@web.de>2014-05-09 10:54:58+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-12 14:35:03+02:00

Message:

chg: format

File:

• factory/facAlgFuncUtil.cc (modified) (7 diffs)

factory/facAlgFuncUtil.cc

@@ -320 +320 @@
       G= q;
     }
-    iter.getItem()= CFFactor (iter.getItem().factor(), iter.getItem().exp()+count);
+    iter.getItem()= CFFactor (iter.getItem().factor(),
+                              iter.getItem().exp() + count);
   }
 }
@@ -435 +436 @@
 
 CanonicalForm
-Sprem ( const CanonicalForm &f, const CanonicalForm &g, CanonicalForm & m, CanonicalForm & q )
+Sprem (const CanonicalForm &f, const CanonicalForm &g, CanonicalForm & m,
+       CanonicalForm & q )
 {
   CanonicalForm ff, gg, l, test, retvalue;
@@ -442 +444 @@
   Variable vf, vg, v;
 
-  if ( (vf = f.mvar()) < (vg = g.mvar()) )
-  {
-    m=CanonicalForm(0); q=CanonicalForm(0);
+  if ((vf = f.mvar()) < (vg = g.mvar()))
+  {
+    m= 0;
+    q= 0;
     return f;
   }
@@ -451 +454 @@
     if ( vf == vg )
     {
-      ff = f; gg = g;
-      reord = false;
-      v = vg; // == x
-    }
-    else
-    {
-      v = Variable(level(f.mvar()) + 1);
-      ff = swapvar(f,vg,v); // == r
-      gg = swapvar(g,vg,v); // == v
+      ff= f;
+      gg= g;
+      reord= false;
+      v= vg; // == x
+    }
+    else
+    {
+      v= Variable (f.level() + 1);
+      ff= swapvar (f, vg, v); // == r
+      gg= swapvar (g, vg, v); // == v
       reord=true;
     }
-    dg = degree( gg, v ); // == dv
-    df = degree( ff, v ); // == dr
-    if (dg <= df) {l=LC(gg); gg = gg -LC(gg)*power(v,dg);}
-    else { l = 1; }
+    dg= degree (gg, v); // == dv
+    df= degree (ff, v); // == dr
+    if (dg <= df)
+    {
+      l= LC (gg);
+      gg= gg - LC(gg)*power(v,dg);
+    }
+    else
+      l = 1;
     n= 0;
-    while ( ( dg <= df  ) && ( !ff.isZero()) )
-    {
-      test= power(v,df-dg) * gg * LC(ff);
-      if ( df == 0 ){ff= ff.genZero();}
-      else {ff= ff - LC(ff)*power(v,df);}
-      ff = l*ff-test;
-      df= degree(ff,v);
+    while ((dg <= df) && (!ff.isZero()))
+    {
+      test= gg*LC (ff)*power (v, df - dg);
+      if (df == 0)
+        ff= 0;
+      else
+        ff= ff - LC(ff)*power(v,df);
+      ff= l*ff - test;
+      df= degree (ff, v);
       n++;
     }
-    if ( reord )
-    {
-      retvalue= swapvar( ff, vg, v );
-    }
-    else
-    {
+
+    if (reord)
+      retvalue= swapvar (ff, vg, v);
+    else
       retvalue= ff;
-    }
-    m= power(l,n);
-    if ( fdivides(g,m*f-retvalue) )
-      q= (m*f-retvalue)/g;
-    else
-      q= CanonicalForm(0);
+
+    m= power (l, n);
+    if (fdivides (g, m*f - retvalue))
+      q= (m*f - retvalue)/g;
+    else
+      q= 0;
     return retvalue;
   }
@@ -542 +551 @@
   int charac= getCharacteristic();
   setCharacteristic(0); // need it for k !
-  int k=1, m=1, length=degreelist.length();
+  int k= 1, m= 1, length= degreelist.length();
   IntListIterator i;
 
-  for (i=degreelist; i.hasItem(); i++) m= m*i.getItem();
-  int q=charac;
-  while (q <= ((n*m)*(n*m)/2)) { k= k+1; q= q*charac;}
-  int l=0;
-  do {
-    for (i=degreelist; i.hasItem(); i++){
-      l= l+1;
-      if ( igcd(k,i.getItem()) == 1){
-        if ( l==length ){ setCharacteristic(charac);  return k; }
+  for (i= degreelist; i.hasItem(); i++)
+     m= m*i.getItem();
+  int q= charac;
+  while (q <= ((n*m)*(n*m)/2))
+  {
+    k= k+1;
+    q= q*charac;
+  }
+  int l= 0;
+  do
+  {
+    for (i= degreelist; i.hasItem(); i++)
+    {
+      l= l + 1;
+      if (igcd (k, i.getItem()) == 1)
+      {
+        if (l == length)
+        {
+          setCharacteristic (charac);
+          return k;
+        }
       }
-      else { break; }
-    }
-    k= k+1; l=0;
-  }
-  while ( 1 );
+      else
+        break;
+    }
+    k= k + 1;
+    l= 0;
+  }
+  while (1);
 }
 
@@ -587 +610 @@
   while (degree (pi1,x) > 0)
   {
-    psqr( pi, pi1, q, pi2, m, x);
+    psqr (pi, pi1, q, pi2, m, x);
     pi2 /= bi;
 
@@ -594 +617 @@
     t0= tmp;
     t1 /= bi;
-    pi = pi1; pi1 = pi2;
-    if ( degree ( pi1, x ) > 0 )
-    {
-      delta = degree( pi, x ) - degree( pi1, x );
-      if ( (delta+1) % 2 )
-        bi = LC( pi, x ) * power( Hi, delta );
+    pi= pi1;
+    pi1= pi2;
+    if (degree (pi1, x) > 0)
+    {
+      delta= degree (pi, x) - degree (pi1, x);
+      if ((delta + 1) % 2)
+        bi= LC (pi, x)*power (Hi, delta);
       else
-        bi = -LC( pi, x ) * power( Hi, delta );
-      Hi = power( LC( pi1, x ), delta ) / power( Hi, delta-1 );
+        bi= -LC (pi, x)*power (Hi, delta);
+      Hi= power (LC (pi1, x), delta)/power (Hi, delta - 1);
     }
   }