Changeset abde36 in git

Timestamp:

May 9, 2014, 11:10:57 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

ec04e88299a064f7c80c463bcdcf43e9db165e5b

Parents:

b17fa5fc9eda365fb2095c16d40c59a2c1e4db02

git-author:

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

git-committer:

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

Message:

chg: better docu and format

File:

• factory/facAlgFunc.cc (modified) (11 diffs)

factory/facAlgFunc.cc

@@ -360 +360 @@
                 CanonicalForm & R)
 {
-  CFList Returnlist, Bstar=Astar;
-  CanonicalForm s, g, ra, rb, oldR, h, denra, denrb=1;
+  CFList Returnlist, Bstar= Astar;
+  CanonicalForm s, g, ra, rb, oldR, h, denra, denrb= 1;
   Variable alpha;
   CFList tmp;
@@ -516 +516 @@
   if (!isRat && getCharacteristic() == 0)
     On (SW_RATIONAL);
-  numinv= QuasiInverse (Rstar, alg_LC(f, algExtLevel), Rstar.mvar());
+  numinv= QuasiInverse (Rstar, alg_LC (f, algExtLevel), Rstar.mvar());
 
   f *= numinv;
@@ -533 +533 @@
   }
 
-  sqrf_norm(f, Rstar, vminpoly, s, g, R );
+  sqrf_norm (f, Rstar, vminpoly, s, g, R);
 
   Variable X;
-  if (hasFirstAlgVar(R,X))
+  if (hasFirstAlgVar (R, X))
   {
     // factorize R over alg.extension with X
-    Factorlist =  factorize( R, X );
+    Factorlist=  factorize (R, X);
   }
   else
   {
     // factor R over k
-    Factorlist = factorize(R);
-  }
-
-  if ( !Factorlist.getFirst().factor().inCoeffDomain() )
-    Factorlist.insert(CFFactor(1,1));
-  if ( Factorlist.length() == 2 && Factorlist.getLast().exp()== 1)
-  { // irreduzibel (first entry is a constant)
+    Factorlist = factorize (R);
+  }
+
+  if (!Factorlist.getFirst().factor().inCoeffDomain())
+    Factorlist.insert (CFFactor (1, 1));
+  if (Factorlist.length() == 2 && Factorlist.getLast().exp()== 1)
+  {
     f= backSubst (f, backSubsts, Astar);
     f *= bCommonDen (f);
@@ -590 +590 @@
     // we are not interested in a
     // constant (over K_r, which can be a polynomial!)
-    if (degree(g, f.mvar())>0){ L.append(CFFactor(g,1)); }
+    if (degree (g, f.mvar()) > 0)
+      L.append (CFFactor (g, 1));
   }
   CFFList LL;
-  if (getCharacteristic()>0)
+  if (getCharacteristic() > 0) //do I really need this part?
   {
     CFFListIterator i=L;
@@ -905 +906 @@
   if (vf.level() <= as.getLast().level())
   {
-// ||( (as.length()==1) && (degree(f,vf)==3) && (degree(as.getFirst()==2)) )
     if (!isRat && getCharacteristic() == 0)
       Off (SW_RATIONAL);
@@ -911 +911 @@
   }
 
-// 2) List of variables:
-// 2a) Setup list of those polys in AS having degree(AS[i], AS[i].mvar()) > 1
-// 2b) Setup variableordering
+// 2) Setup list of those polys in AS having degree > 1
   CFList Astar;
   Variable x;
   CanonicalForm elem;
   Varlist ord, uord;
-  for ( int ii=1; ii< level(vf) ; ii++ ) { uord.append(Variable(ii));  }
-
-  for ( i=as; i.hasItem(); i++ ){
+  for (int ii= 1; ii < level (vf); ii++)
+    uord.append (Variable (ii));
+
+  for (i= as; i.hasItem(); i++)
+  {
     elem= i.getItem();
     x= elem.mvar();
-    if ( degree(elem,x) > 1){ // otherwise it's not an extension
-      Astar.append(elem);
-      ord.append(x);
-    }
-  }
-  uord= Difference(uord,ord);
+    if (degree (elem, x) > 1)  // otherwise it's not an extension
+    {
+      Astar.append (elem);
+      ord.append (x);
+    }
+  }
+  uord= Difference (uord, ord);
 
 // 3) second trivial cases: we already proved irr. of f over no extensions
-  if ( Astar.length() == 0 ){
+  if (Astar.length() == 0)
+  {
     if (!isRat && getCharacteristic() == 0)
       Off (SW_RATIONAL);
-    return CFFList(CFFactor(f,1));
-  }
-
-// 4) Try to obtain a partial factorization using prop2 and prop3
-//    Use with caution! We have to proof these propositions first!
-  // Not yet implemented
-
-// 5) Look if elements in uord actually occure in any of the minimal
+    return CFFList (CFFactor (f, 1));
+  }
+
+// 4) Look if elements in uord actually occur in any of the minimal
 //    polynomials. If no element of uord occures in any of the minimal
-//   polynomials, we don't have transzendentals.
+//    polynomials the field is an alg. number field not an alg. function field
   Varlist newuord= varsInAs (uord, Astar);
 
   CFFList Factorlist;
-  Varlist gcdord= Union(ord,newuord);
-  gcdord.append(f.mvar());
+  Varlist gcdord= Union (ord, newuord);
+  gcdord.append (f.mvar());
   bool isFunctionField= (newuord.length() > 0);
 
-  // This is for now. we need alg_sqrfree implemented!
+  // TODO alg_sqrfree?
   CanonicalForm Fgcd= 0;
   if (isFunctionField)
@@ -969 +967 @@
     }
 
-    Fgcd= pp(Fgcd); Ggcd= pp(Ggcd);
+    Fgcd= pp (Fgcd);
+    Ggcd= pp (Ggcd);
     if (!isRat && getCharacteristic() == 0)
       Off (SW_RATIONAL);
@@ -975 +974 @@
   }
 
-  if ( getCharacteristic() > 0 )
-  {
-    // First look for extension!
+  if (getCharacteristic() > 0)
+  {
     IntList degreelist;
     Variable vminpoly;
-    for (i=Astar; i.hasItem(); i++){degreelist.append(degree(i.getItem()));}
-    int extdeg= getDegOfExt (degreelist, degree(f));
-
-    // Now the real stuff!
-    if ( newuord.length() == 0 ) // no transzendentals
-    {
-      if ( extdeg > 1 ){
+    for (i= Astar; i.hasItem(); i++)
+      degreelist.append (degree (i.getItem()));
+
+    int extdeg= getDegOfExt (degreelist, degree (f));
+
+    if (newuord.length() == 0) // no parameters
+    {
+      if (extdeg > 1)
+      {
         CanonicalForm MIPO= generateMipo (extdeg);
         vminpoly= rootOf(MIPO);
@@ -993 +993 @@
       return Factorlist;
     }
-    else if (isInseparable(Astar) || derivZero) // Look if extensions are separable
-    {
-      Factorlist= SteelTrager(f, Astar);
+    else if (isInseparable(Astar) || derivZero) // inseparable case
+    {
+      Factorlist= SteelTrager (f, Astar);
       return Factorlist;
     }
-    else{ // we are on the save side: Use trager
-      if (extdeg > 1 ){
+    else // separable case
+    {
+      if (extdeg > 1)
+      {
         CanonicalForm MIPO=generateMipo (extdeg);
-        vminpoly= rootOf(MIPO);
-      }
-      Factorlist= Trager(f, Astar, vminpoly, as, isFunctionField);
+        vminpoly= rootOf (MIPO);
+      }
+      Factorlist= Trager (f, Astar, vminpoly, as, isFunctionField);
       return Factorlist;
     }
   }
-  else{ // char=0 apply trager directly
+  else // char 0
+  {
     Variable vminpoly;
-    Factorlist= Trager(f, Astar, vminpoly, as, isFunctionField);
+    Factorlist= Trager (f, Astar, vminpoly, as, isFunctionField);
     if (!isRat && getCharacteristic() == 0)
       Off (SW_RATIONAL);
@@ -1031 +1034 @@
     Factors.removeFirst();
 
-  if ( as.length() == 0 )
+  if (as.length() == 0)
   {
     if (!isRat && getCharacteristic() == 0)
@@ -1044 +1047 @@
   }
 
-  for ( CFFListIterator i=Factors; i.hasItem(); i++ )
+  for (CFFListIterator i=Factors; i.hasItem(); i++)
   {
     if (i.getItem().factor().level() > as.getLast().level())
     {
-      output=facAlgFunc2(i.getItem().factor(), as);
-      for ( CFFListIterator j=output; j.hasItem(); j++)
-        Output = append(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
+      output= facAlgFunc2 (i.getItem().factor(), as);
+      for (CFFListIterator j= output; j.hasItem(); j++)
+        Output= append (Output, CFFactor (j.getItem().factor(),
+                                          j.getItem().exp()*i.getItem().exp()));
     }
   }