Changeset 31b296e in git

Timestamp:

Jul 25, 2019, 3:18:50 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

bd5ff4034c6329566588caf816d298e914084631

Parents:

35a153cf7acb82519d52d0b74581e9a193d15765

Message:

opt: less calls to setCharacteristic(p),pLength in conv. Singular->Factory

File:

• libpolys/polys/clapconv.cc (modified) (3 diffs)

libpolys/polys/clapconv.cc

@@ -87 +87 @@
   p1=p;
   l=l/2;
-  while(l>0) { p=pNext(p); l--; }
+  while(l>1) { p=pNext(p); l--; }
   p2=pNext(p);
   pNext(p)=NULL;
@@ -101 +101 @@
 
 #define MIN_CONV_LEN 7
-CanonicalForm convSingPFactoryP( poly p, const ring r )
+static CanonicalForm convSingPFactoryP_intern( poly p, int l, BOOLEAN & setChar,const ring r )
 {
   CanonicalForm result = 0;
   int e, n = rVar(r);
-  BOOLEAN setChar=TRUE;
-
-  int l;
-  if ((l=pLength(p))>MIN_CONV_LEN)
+  assume(l==pLength(p));
+
+  if (l>MIN_CONV_LEN)
   {
     poly p1,p2;
     convPhalf(p,l,p1,p2);
-    CanonicalForm P=convSingPFactoryP(p1,r);
-    P+=convSingPFactoryP(p2,r);
+    CanonicalForm P=convSingPFactoryP_intern(p1,l/2,setChar,r);
+    P+=convSingPFactoryP_intern(p2,l-l/2,setChar,r);
     convPunhalf(p1,p2);
     return P;
   }
+  BOOLEAN setChar_loc=setChar;
+  setChar=FALSE;
   while ( p!=NULL )
   {
-    CanonicalForm term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar, r->cf);
+    CanonicalForm term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar_loc, r->cf);
     if (errorreported) break;
-    setChar=FALSE;
+    setChar_loc=FALSE;
     for ( int i = 1; i <=n; i++ )
     {
@@ -131 +132 @@
  }
  return result;
+}
+
+CanonicalForm convSingPFactoryP( poly p, const ring r )
+{
+  BOOLEAN setChar=TRUE;
+  return convSingPFactoryP_intern(p,pLength(p),setChar,r);
 }