Changeset ab4286 in git for libpolys

Timestamp:

Dec 6, 2018, 3:57:34 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

199f11deee800eb0c6a0cf7fbef6ed1fcbe0b7c96cb81baf02a1e7d45e2bcae574b11d92864162f3

Parents:

757eac36df59510348bf034d6ebdc03389e843f8

Message:

fix: heuristic for det

File:

• libpolys/polys/sparsmat.cc (modified) (1 diff)

libpolys/polys/sparsmat.cc

@@ -309 +309 @@
 
   if (d>100)
-    return sw;
+    return TRUE;
   if (!rField_is_Q(r))
-    return sw;
+    return TRUE;
   s = t = 0;
-  if (sw)
-  {
-    for(i=IDELEMS(I)-1;i>=0;i--)
-    {
-      p=I->m[i];
-      if (p!=NULL)
-      {
-        if(!p_IsConstant(p,r))
-          return sw;
-        s++;
-        t+=n_Size(pGetCoeff(p),r->cf);
-      }
-    }
-  }
-  else
-  {
-    for(i=IDELEMS(I)-1;i>=0;i--)
-    {
-      p=I->m[i];
-      if (!p_IsConstantPoly(p,r))
-        return sw;
-      while (p!=NULL)
-      {
-        s++;
-        t+=n_Size(pGetCoeff(p),r->cf);
-        pIter(p);
-      }
+  // now: field is Q, n<=100
+  for(i=IDELEMS(I)-1;i>=0;i--)
+  {
+    p=I->m[i];
+    if (p!=NULL)
+    {
+      if(!p_IsConstant(p,r))
+        return TRUE;
+      s++;
+      t+=n_Size(pGetCoeff(p),r->cf);
     }
   }
   s*=15;
   if (t>s)
-    return !sw;
+    return FALSE;// few large constanst entries
   else
-    return sw;
+    return TRUE; //many small entries
 }