Changeset 0a8ee5 in git

Timestamp:

Mar 19, 2010, 3:38:41 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

2937222b4a61df047ac996df75f1a6bfe245af2c

Parents:

18871b8b1489681d13f6dadcbc2940b541da2be2

Message:

sca-std optimization

git-svn-id: file:///usr/local/Singular/svn/trunk@12655 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• gring.cc (modified) (10 diffs)
• kspoly.cc (modified) (1 diff)
• sca.cc (modified) (3 diffs)

kernel/gring.cc

@@ -1954 +1954 @@
   // b will not be multiplied by any constant in this impl.
   // ==> *c=1
-  *c=nInit(1);
+  if (c!=NULL) *c=nInit(1);
   poly m=pOne();
   pExpVectorDiff(m,kBucketGetLm(b),p);
@@ -1965 +1965 @@
   pDelete(&m);
   number n=nCopy(pGetCoeff(pp));
-  number MinusOne=nInit(-1);
   number nn;
-  if (!nEqual(n,MinusOne))
+  if (!n_IsMOne(n,currRing))
   {
     nn=nNeg(nInvers(n));
@@ -1977 +1976 @@
   pp=p_Mult_nn(pp,n,currRing);
   nDelete(&n);
-  nDelete(&MinusOne);
   int l=pLength(pp);
   kBucket_Add_q(b,pp,&l);
@@ -2001 +1999 @@
   // b will not be multiplied by any constant in this impl.
   // ==> *c=1
-  *c=nInit(1);
+  if (c!=NULL) *c=nInit(1);
   poly m = pOne();
   const poly pLmB = kBucketGetLm(b); // no new copy!
@@ -2030 +2028 @@
   assume( pp != NULL );
   const number n = pGetCoeff(pp); // bug!
-  number nn;
 
   if (!n_IsMOne(n,currRing) ) // does this improve performance??!? also see below... // TODO: check later on.
-  {
-    nn=nNeg(nInvers(nCopy(n)));
-  }
-  else nn=nInit(1);           // if n == -1 => nn = 1 and -1/n otherwise
-
-  number t = nMult(nn,pGetCoeff(pLmB));
-  nDelete(&nn);
-
-  pp = p_Mult_nn(pp,t,currRing);
-  nDelete(&t);
+  // if n == -1 => nn = 1 and -1/n
+  {
+    number nn=nNeg(nInvers(n));
+    number t = nMult(nn,pGetCoeff(pLmB));
+    nDelete(&nn);
+    pp = p_Mult_nn(pp,t,currRing);
+    nDelete(&t);
+  }
+  else
+  {
+    pp = p_Mult_nn(pp,pGetCoeff(pLmB),currRing);
+  }
 
   int l = pLength(pp);
@@ -2063 +2062 @@
 {
   // b is multiplied by a constant in this impl.
+  number ctmp;
   poly m=pOne();
   pExpVectorDiff(m,kBucketGetLm(b),p);
@@ -2069 +2069 @@
   pTest(m);
 #endif
-  if(p_IsConstant(m,currRing)){
+  if(p_IsConstant(m,currRing))
+  {
     pDelete(&m);
-    *c = kBucketPolyRed(b,p,pLength(p),NULL);
-    return;
-  }
-  poly pp = nc_mm_Mult_pp(m,p,currRing);
-  number c2,cc;
-  pCleardenom_n(pp,c2);
-  pDelete(&m);
-  *c = kBucketPolyRed(b,pp,pLength(pp),NULL);
-  //cc=*c;
-  //*c=nMult(*c,c2);
-  nDelete(&c2);
-  //nDelete(&cc);
-  pDelete(&pp);
-
+    ctmp = kBucketPolyRed(b,p,pLength(p),NULL);
+  }
+  else
+  {
+    poly pp = nc_mm_Mult_pp(m,p,currRing);
+    number c2,cc;
+    pCleardenom_n(pp,c2);
+    pDelete(&m);
+    ctmp = kBucketPolyRed(b,pp,pLength(pp),NULL);
+    //cc=*c;
+    //*c=nMult(*c,c2);
+    nDelete(&c2);
+    //nDelete(&cc);
+    pDelete(&pp);
+  }
+  if (c!=NULL) *c=ctmp;
+  else nDelete(&ctmp);
 }
 
@@ -2090 +2094 @@
 {
   // b is multiplied by a constant in this impl.
+  number ctmp;
   poly m=pOne();
   pExpVectorDiff(m,kBucketGetLm(b),p);
@@ -2100 +2105 @@
   {
     pDelete(&m);
-    *c = kBucketPolyRed(b,p,pLength(p),NULL);
-    return;
-  }
-  poly pp = nc_mm_Mult_pp(m,p,currRing);
-  number c2,cc;
-  pCleardenom_n(pp,c2);
-  pDelete(&m);
-  *c = kBucketPolyRed(b,pp,pLength(pp),NULL);
-  //cc=*c;
-  //*c=nMult(*c,c2);
-  nDelete(&c2);
-  //nDelete(&cc);
-  pDelete(&pp);
-
+    ctmp = kBucketPolyRed(b,p,pLength(p),NULL);
+  }
+  else
+  {
+    poly pp = nc_mm_Mult_pp(m,p,currRing);
+    number c2,cc;
+    pCleardenom_n(pp,c2);
+    pDelete(&m);
+    ctmp = kBucketPolyRed(b,pp,pLength(pp),NULL);
+    //cc=*c;
+    //*c=nMult(*c,c2);
+    nDelete(&c2);
+    //nDelete(&cc);
+    pDelete(&pp);
+  }
+  if (c!=NULL) *c=ctmp;
+  else nDelete(&ctmp);
 }
 
@@ -2169 +2177 @@
   // b will not by multiplied by any constant in this impl.
   // ==> *c=1
-  *c=nInit(1);
+  if (c!=NULL) *c=nInit(1);
 
   poly pp = NULL;

kernel/kspoly.cc

@@ -76 +76 @@
     // no exp-bound checking needed 
     // (only needed if exp-bound(tailring)<exp-b(currRing))
-    number c;
-    if (PR->bucket!=NULL)  nc_kBucketPolyRed(PR->bucket, p2,&c);
+    if (PR->bucket!=NULL)  nc_kBucketPolyRed(PR->bucket, p2,coef);
     else 
     {
       poly _p = (PR->t_p != NULL ? PR->t_p : PR->p);
       assume(_p != NULL);
-      nc_PolyPolyRed(_p, p2,&c);
+      nc_PolyPolyRed(_p, p2,coef);
       if (PR->t_p!=NULL) PR->t_p=_p; else PR->p=_p;
-      PR->pLength=pLength(_p);
-    }
-    if (coef!=NULL) *coef=c;
-    else nDelete(&c);
+      PR->pLength=0; // usaully not used, GetpLength re-comoutes it if needed
+    }
     return 0;
   }

kernel/sca.cc

@@ -312 +312 @@
           return NULL;
         }
-
         tpower ^= cpower; // compute degree of (-1).
       }
-
       cpower ^= iExp1;
     }
@@ -606 +604 @@
 #endif
 
-  if( ( pPoly == NULL ) || ( pMonom == NULL ) )
-    return NULL;
+  assume( (pPoly != NULL) && (pMonom !=NULL));
 
   const int iComponentMonomM = p_GetComp(pMonom, rRing);
@@ -2045 +2042 @@
   /* complete reduction of the standard basis--------- */
 
-  if (TEST_OPT_REDSB){
+  if (TEST_OPT_REDSB)
+  {
     completeReduce(strat);
   }