Changeset 2dbf7e in git for factory/facFqSquarefree.cc

Timestamp:

Jan 11, 2012, 12:53:11 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e6d914d46115be7cd5ff3fbf2059f167d89779ec

Parents:

6c98d526bf15bb5a2845bfd4fb4f54474229668c

git-author:

Martin Lee <martinlee84@web.de>2012-01-11 12:53:11+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-01-11 15:21:15+01:00

Message:

fix: some issues with leading coeff in squarefree factorization over finite fields

File:

• factory/facFqSquarefree.cc (modified) (2 diffs)

factory/facFqSquarefree.cc

@@ -110 +110 @@
   int l= x.level();
   int k;
-  bool GF= false;
   if (CFFactory::gettype() == GaloisFieldDomain)
     k= getGFDegree();
@@ -174 +173 @@
       j.getItem()= CFFactor (j.getItem().factor()/tmp, j.getItem().exp());
       if (degree (tmp) > 0 && tmp.level() > 0)
-        result.append (CFFactor (M (tmp),
+      {
+        tmp= M (tmp);
+        result.append (CFFactor (tmp/Lc(tmp),
                        j.getItem().exp()*p + i.getItem().exp()));
+      }
     }
   }
   for (CFFListIterator i= tmp2; i.hasItem(); i++)
+  {
     if (degree (i.getItem().factor()) > 0 && i.getItem().factor().level() >= 0)
-      result.append (CFFactor (M (i.getItem().factor()), i.getItem().exp()));
+    {
+      tmp= M (i.getItem().factor());
+      result.append (CFFactor (tmp/Lc(tmp), i.getItem().exp()));
+    }
+  }
   for (CFFListIterator j= tmp1; j.hasItem(); j++)
+  {
     if (degree (j.getItem().factor()) > 0 && j.getItem().factor().level() >= 0)
-      result.append (CFFactor (M (j.getItem().factor()), j.getItem().exp()*p));
+    {
+      tmp= M (j.getItem().factor());
+      result.append (CFFactor (tmp/Lc(tmp), j.getItem().exp()*p));
+    }
+  }
   return result;
 }