Changeset 0334da in git

Timestamp:

Aug 15, 2018, 3:29:29 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

9b1bb5c6905835dc71901fe935e99adb6ea74769

Parents:

ca7ea8aa24a72e1d3018272972748da1f3102f6d

Message:

simplify p_InitContent

File:

• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -2596 +2596 @@
 #else
 {
+  /* ph has al least 2 terms */
   number d=pGetCoeff(ph);
-  int s;
-  int s2=-1;
-  if(rField_is_Q(r))
-  {
-    if  (SR_HDL(d)&SR_INT) return d;
-    s=mpz_size1(d->z);
-  }
-  else
-    s=n_Size(d,r->cf);
-  number d2=d;
-  loop
-  {
+  int s=n_Size(d,r->cf);
+  pIter(ph);
+  number d2=pGetCoeff(ph);
+  int s2=n_Size(d2,r->cf);
+  pIter(ph);
+  if (ph==NULL)
+  {
+    if (s<s2) return n_Copy(d,r->cf);
+    else      return n_Copy(d2,r->cf);
+  }
+  do
+  {
+    number nd=pGetCoeff(ph);
+    int ns=n_Size(nd,r->cf);
+    if (ns<=2)
+    {
+      s2=s;
+      d2=d;
+      d=nd;
+      s=ns;
+      break;
+    }
+    else if (ns<s)
+    {
+      s2=s;
+      d2=d;
+      d=nd;
+      s=ns;
+    }
     pIter(ph);
-    if(ph==NULL)
-    {
-      if (s2==-1) return n_Copy(d,r->cf);
-      break;
-    }
-    if (rField_is_Q(r))
-    {
-      if (SR_HDL(pGetCoeff(ph))&SR_INT)
-      {
-        s2=s;
-        d2=d;
-        s=0;
-        d=pGetCoeff(ph);
-        if (s2==0) break;
-      }
-      else if (mpz_size1((pGetCoeff(ph)->z))<=s)
-      {
-        s2=s;
-        d2=d;
-        d=pGetCoeff(ph);
-        s=mpz_size1(d->z);
-      }
-    }
-    else
-    {
-      int ns=n_Size(pGetCoeff(ph),r->cf);
-      if (ns<=3)
-      {
-        s2=s;
-        d2=d;
-        d=pGetCoeff(ph);
-        s=ns;
-        if (s2<=3) break;
-      }
-      else if (ns<s)
-      {
-        s2=s;
-        d2=d;
-        d=pGetCoeff(ph);
-        s=ns;
-      }
-    }
-  }
+  }
+  while(ph!=NULL);
   return n_SubringGcd(d,d2,r->cf);
 }