Changeset 8baf483 in git

Timestamp:

Mar 22, 2012, 2:14:26 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a5450a84cceebf718a03d5c66125aabfc921bd4e

Parents:

6caa2a65af91c075a92633672407af2890482e93

git-author:

Martin Lee <martinlee84@web.de>2012-03-22 14:14:26+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:27+02:00

Message:

chg: use squarefree factorization instead of squarefree part

File:

• factory/facFqFactorize.h (modified) (3 diffs)

factory/facFqFactorize.h

@@ -152 +152 @@
   Variable a= Variable (1);
   CanonicalForm LcF= Lc (F);
-  CanonicalForm pthRoot, A;
-  CanonicalForm sqrfP= sqrfPart (F/Lc(F), pthRoot, a);
-  CFList buf, bufRoot;
-  CFFList result, resultRoot;
-  int p= getCharacteristic();
-  int l;
-  if (degree (pthRoot) > 0)
+  CFFList sqrf= FpSqrf (F, false);
+  CFFList result;
+  CFList bufResult;
+  sqrf.removeFirst();
+  CFListIterator i;
+  for (CFFListIterator iter= sqrf; iter.hasItem(); iter++)
   {
-    pthRoot= maxpthRoot (pthRoot, p, l);
-    result= FpFactorize (pthRoot, false);
-    result.removeFirst();
-    for (CFFListIterator i= result; i.hasItem(); i++)
-      i.getItem()= CFFactor(i.getItem().factor(),i.getItem().exp()*ipower(p,l));
-    result.insert (CFFactor (LcF, 1));
-    return result;
-  }
-  else
-  {
-    buf= multiFactorize (sqrfP, info);
-    A= F/LcF;
-    result= multiplicity (A, buf);
-  }
-  if (degree (A) > 0)
-  {
-    resultRoot= FpFactorize (A, false);
-    resultRoot.removeFirst();
-    result= Union (result, resultRoot);
+    bufResult= multiFactorize (iter.getItem().factor(), info);
+    for (i= bufResult; i.hasItem(); i++)
+      result.append (CFFactor (i.getItem(), iter.getItem().exp()));
   }
   result.insert (CFFactor (LcF, 1));
@@ -246 +229 @@
   ExtensionInfo info= ExtensionInfo (alpha, false);
   CanonicalForm LcF= Lc (F);
-  CanonicalForm pthRoot, A;
-  CanonicalForm sqrfP= sqrfPart (F/Lc(F), pthRoot, alpha);
-  CFList buf, bufRoot;
-  CFFList result, resultRoot;
-  int p= getCharacteristic();
-  int q= ipower (p, degree (getMipo (alpha)));
-  int l;
-  if (degree (pthRoot) > 0)
+  CFFList sqrf= FqSqrf (F, alpha, false);
+  CFFList result;
+  CFList bufResult;
+  sqrf.removeFirst();
+  CFListIterator i;
+  for (CFFListIterator iter= sqrf; iter.hasItem(); iter++)
   {
-    pthRoot= maxpthRoot (pthRoot, q, l);
-    result= FqFactorize (pthRoot, alpha, false);
-    result.removeFirst();
-    for (CFFListIterator i= result; i.hasItem(); i++)
-      i.getItem()= CFFactor(i.getItem().factor(),i.getItem().exp()*ipower(p,l));
-    result.insert (CFFactor (LcF, 1));
-    return result;
-  }
-  else
-  {
-    buf= multiFactorize (sqrfP, info);
-    A= F/LcF;
-    result= multiplicity (A, buf);
-  }
-  if (degree (A) > 0)
-  {
-    resultRoot= FqFactorize (A, alpha, false);
-    resultRoot.removeFirst();
-    result= Union (result, resultRoot);
+    bufResult= multiFactorize (iter.getItem().factor(), info);
+    for (i= bufResult; i.hasItem(); i++)
+      result.append (CFFactor (i.getItem(), iter.getItem().exp()));
   }
   result.insert (CFFactor (LcF, 1));
@@ -343 +308 @@
   ExtensionInfo info= ExtensionInfo (getGFDegree(), gf_name, false);
   CanonicalForm LcF= Lc (F);
-  CanonicalForm pthRoot, A;
-  CanonicalForm sqrfP= sqrfPart (F/LcF, pthRoot, a);
-  CFList buf;
-  CFFList result, resultRoot;
-  int p= getCharacteristic();
-  int q= ipower (p, getGFDegree());
-  int l;
-  if (degree (pthRoot) > 0)
+  CFFList sqrf= GFSqrf (F, false);
+  CFFList result;
+  CFList bufResult;
+  sqrf.removeFirst();
+  CFListIterator i;
+  for (CFFListIterator iter= sqrf; iter.hasItem(); iter++)
   {
-    pthRoot= maxpthRoot (pthRoot, q, l);
-    result= GFFactorize (pthRoot, false);
-    result.removeFirst();
-    for (CFFListIterator i= result; i.hasItem(); i++)
-      i.getItem()= CFFactor(i.getItem().factor(),i.getItem().exp()*ipower(p,l));
-    result.insert (CFFactor (LcF, 1));
-    return result;
-  }
-  else
-  {
-    buf= multiFactorize (sqrfP, info);
-    A= F/LcF;
-    result= multiplicity (A, buf);
-  }
-  if (degree (A) > 0)
-  {
-    resultRoot= GFFactorize (A, false);
-    resultRoot.removeFirst();
-    result= Union (result, resultRoot);
+    bufResult= multiFactorize (iter.getItem().factor(), info);
+    for (i= bufResult; i.hasItem(); i++)
+      result.append (CFFactor (i.getItem(), iter.getItem().exp()));
   }
   result.insert (CFFactor (LcF, 1));