Changeset 3ef0a0 in git for factory/facFqBivar.cc

Timestamp:

Jun 20, 2012, 11:07:20 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

04cda6a6e7c54cffb526576f62140396a6cc5968

Parents:

eca69d4cc744be10bc6ca1e28244971391756e97

git-author:

Martin Lee <martinlee84@web.de>2012-06-20 11:07:20+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-07-31 11:49:29+02:00

Message:

chg: fewer univariate factorizations if input is symmetric

File:

• factory/facFqBivar.cc (modified) (9 diffs)

factory/facFqBivar.cc

@@ -6034 +6034 @@
     bufAeval= A;
     bufEvaluation= evalPoint (A, bufAeval, alpha, list, GF, fail);
-    if (!derivXZero && !fail2)
+    if (!derivXZero && !fail2 && !symmetric)
     {
       if (i == 0)
@@ -6047 +6047 @@
     if (fail && (i == 0))
     {
-      if (!derivXZero && !fail2)
+      if (!derivXZero && !fail2 && !symmetric)
       {
         bufEvaluation= bufEvaluation2;
@@ -6087 +6087 @@
               (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
 
-    if (!derivXZero && !fail2)
+    if (!derivXZero && !fail2 && !symmetric)
     {
       TIMING_START (fac_fq_uni_factorizer);
@@ -6098 +6098 @@
 
     if (bufUniFactors.length() == 1 ||
-        (!fail2 && !derivXZero && (bufUniFactors2.length() == 1)))
+        (!fail2 && !derivXZero && !symmetric && (bufUniFactors2.length() == 1)))
     {
       if (extension)
@@ -6136 +6136 @@
       }
 
-      if (!derivXZero && !fail2 && subCheck2 > 0)
+      if (!derivXZero && !fail2 && !symmetric && subCheck2 > 0)
       {
         int subCheck= substituteCheck (bufUniFactors2);
@@ -6156 +6156 @@
     // degree analysis
     bufDegs = DegreePattern (bufUniFactors);
-    if (!derivXZero && !fail2)
+    if (!derivXZero && !fail2 && !symmetric)
       bufDegs2= DegreePattern (bufUniFactors2);
 
@@ -6165 +6165 @@
       uniFactors= bufUniFactors;
       degs= bufDegs;
-      if (!derivXZero && !fail2)
+      if (!derivXZero && !fail2 && !symmetric)
       {
         Aeval2= bufAeval2;
@@ -6176 +6176 @@
     {
       degs.intersect (bufDegs);
-      if (!derivXZero && !fail2)
+      if (!derivXZero && !fail2 && !symmetric)
       {
         degs2.intersect (bufDegs2);
@@ -6194 +6194 @@
     }
     list.append (bufEvaluation);
-    if (!derivXZero && !fail2)
+    if (!derivXZero && !fail2 && !symmetric)
       list2.append (bufEvaluation2);
   }
 
-  if (!derivXZero && !fail2)
+  if (!derivXZero && !fail2 && !symmetric)
   {
     if (uniFactors.length() > uniFactors2.length() ||