Changeset 6ad45e in git

Timestamp:

Jan 10, 2014, 1:15:38 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0b7a8a6c046634bef2214699c4d563e3943a646b

Parents:

58effbc527b95873aef4b38419a11880d8f824a2

git-author:

Martin Lee <martinlee84@web.de>2014-01-10 13:15:38+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:05+01:00

Message:

chg: discart evaluation points that lead to a content

Location:

factory

Files:

• facFactorize.cc (modified) (1 diff)
• facFqFactorize.cc (modified) (2 diffs)

factory/facFactorize.cc

@@ -129 +129 @@
     iter++;
     CanonicalForm contentx= content (iter.getItem(), x);
+    if (degree (contentx) > 0)
+    {
+      result= CFList();
+      eval= CFList();
+      LCFeval= CFList();
+      E.nextpoint();
+      continue;
+    }
+    contentx= content (iter.getItem());
     if (degree (contentx) > 0)
     {

factory/facFqFactorize.cc

@@ -876 +876 @@
     i++;
     CanonicalForm contentx= content (i.getItem(), x);
+    if (degree (contentx) > 0)
+    {
+      if (!find (list, random))
+        list.append (random);
+      result= CFList();
+      LCFeval= CFList();
+      eval= CFList();
+      continue;
+    }
+
+    contentx= content (i.getItem());
     if (degree (contentx) > 0)
     {
@@ -1970 +1981 @@
     }
     if (!content(tmp,1).inCoeffDomain())
+      preserveDegree= false;
+    if (!content(tmp).inCoeffDomain())
       preserveDegree= false;
     if (!(gcd (deriv (tmp,x), tmp)).inCoeffDomain())