Changeset 2d3e75 in git

Timestamp:

May 6, 2014, 3:12:48 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

8ee8872586f6afb3a56799c3ea783d6675f18263

Parents:

b743d90a6fd61ebb75fd6c95d5fa9eeb54ecc38e

Message:

towards a uniq n_Div: removing some of n_IntDiv

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/misc_ip.cc (modified) (1 diff)
• kernel/GBEngine/tgbgauss.cc (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (2 diffs)
• libpolys/polys/kbuckets.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (7 diffs)

Singular/iparith.cc

@@ -1177 +1177 @@
     return TRUE;
   }
-  q = n_IntDiv((number)u->Data(),q,coeffs_BIGINT);
+  q = n_Div((number)u->Data(),q,coeffs_BIGINT);
   n_Normalize(q,coeffs_BIGINT);
   res->data = (char *)q;

Singular/misc_ip.cc

@@ -1206 +1206 @@
   basePackHdl=h;
 
-  coeffs_BIGINT = nInitChar(n_Q,NULL);
+  coeffs_BIGINT = nInitChar(n_Q,(void*)1);
 
 #if 1

kernel/GBEngine/tgbgauss.cc

@@ -894 +894 @@
       while (p!=NULL)
       {
-        d = nIntDiv(p->coef,h);
+        d = nExactDiv(p->coef,h);
         nDelete(&p->coef);
         p->coef=d;

libpolys/coeffs/longrat.cc

@@ -2933 +2933 @@
   return NULL;
 }
-
-BOOLEAN nlInitChar(coeffs r, void*)
+BOOLEAN nlCoeffIsEqual(const coeffs r, n_coeffType n, void *p)
+{
+  /* test, if r is an instance of nInitCoeffs(n,parameter) */
+  /* if paramater is not needed */
+  if (n==r->type)
+  {
+    if ((p==NULL)&&(r->cfDiv==nlDiv)) return TRUE;
+    if ((p!=NULL)&&(r->cfDiv!=nlDiv)) return TRUE;
+  }
+  return FALSE;
+}
+
+
+
+BOOLEAN nlInitChar(coeffs r, void*p)
 {
   assume( getCoeffType(r) == ID );
   //const int ch = (int)(long)(p);
 
-  r->nCoeffIsEqual=ndCoeffIsEqual;
+  r->nCoeffIsEqual=nlCoeffIsEqual;
   r->cfKillChar = ndKillChar; /* dummy */
   r->cfCoeffString=nlCoeffString;
@@ -2949 +2962 @@
   r->cfSub   = nlSub;
   r->cfAdd   = nlAdd;
-  r->cfDiv   = nlDiv;
+  if (p==NULL) r->cfDiv   = nlDiv;
+  else         r->cfDiv   = nlIntDiv;
   r->cfIntDiv= nlIntDiv;
   r->cfIntMod= nlIntMod;

libpolys/polys/kbuckets.cc

@@ -840 +840 @@
       if (!(n_IsOne(gcd,r)))
       {
-        number orig_coef2=n_IntDiv(orig_coef,gcd,r);
-        number add_coef2=n_IntDiv(add_coef, gcd,r);
+        number orig_coef2=n_ExactDiv(orig_coef,gcd,r);
+        number add_coef2=n_ExactDiv(add_coef, gcd,r);
         n_Delete(&orig_coef,r);
         n_Delete(&add_coef,r);
@@ -917 +917 @@
       if (!(n_IsOne(gcd,r)))
       {
-        number orig_coef2=n_IntDiv(orig_coef,gcd,r);
-        number add_coef2=n_IntDiv(add_coef, gcd,r);
+        number orig_coef2=n_ExactDiv(orig_coef,gcd,r);
+        number add_coef2=n_ExactDiv(add_coef, gcd,r);
         n_Delete(&orig_coef,r);
         n_Delete(&n,r);
@@ -1249 +1249 @@
       assume(bucket->coef[i]!=NULL);
       number lc=p_GetCoeff(bucket->coef[i],r);
-      p_SetCoeff(bucket->coef[i], n_IntDiv(lc,coef,r),r);
+      p_SetCoeff(bucket->coef[i], n_ExactDiv(lc,coef,r),r);
       assume(!(n_IsZero(p_GetCoeff(bucket->coef[i],r),r)));
     }
@@ -1323 +1323 @@
   else
   {
-    an = n_IntDiv(an, cn, r);
-    bn = n_IntDiv(bn, cn, r);
+    an = n_ExactDiv(an, cn, r);
+    bn = n_ExactDiv(bn, cn, r);
   }
   n_Delete(&cn, r);

libpolys/polys/monomials/p_polys.cc

@@ -2002 +2002 @@
       n_Delete(&x,r->cf);
       x = n_Init(e,r->cf);
-      bin[e] = n_IntDiv(y,x,r->cf);
+      bin[e] = n_ExactDiv(y,x,r->cf);
       n_Delete(&x,r->cf);
       n_Delete(&y,r->cf);
@@ -2302 +2302 @@
       {
         //d = nDiv(pGetCoeff(p),h);
-        //tmp = nIntDiv(pGetCoeff(p),h);
+        //tmp = nExactDiv(pGetCoeff(p),h);
         //if (!nEqual(d,tmp))
         //{
@@ -2310 +2310 @@
         //}
         //nDelete(&tmp);
-        d = n_IntDiv(pGetCoeff(p),h,r->cf);
+        d = n_ExactDiv(pGetCoeff(p),h,r->cf);
         p_SetCoeff(p,d,r);
         pIter(p);
@@ -2451 +2451 @@
   {
 #if 1
-    d = nlIntDiv(pGetCoeff(p),h,r->cf);
+    d = nlExactDiv(pGetCoeff(p),h,r->cf);
     p_SetCoeff(p,d,r);
 #else
-    nlInpIntDiv(pGetCoeff(p),h,r->cf);
+    nlInpExactDiv(pGetCoeff(p),h,r->cf);
 #endif
     pIter(p);
@@ -2595 +2595 @@
 //      while (p!=NULL)
 //      {
-//        d = nIntDiv(pGetCoeff(p),h);
+//        d = nExactDiv(pGetCoeff(p),h);
 //        pSetCoeff(p,d);
 //        pIter(p);
@@ -2644 +2644 @@
       {
         //d = nDiv(pGetCoeff(p),h);
-        //tmp = nIntDiv(pGetCoeff(p),h);
+        //tmp = nExactDiv(pGetCoeff(p),h);
         //if (!nEqual(d,tmp))
         //{
@@ -2652 +2652 @@
         //}
         //nDelete(&tmp);
-        d = n_IntDiv(pGetCoeff(p),h,r->cf);
+        d = n_ExactDiv(pGetCoeff(p),h,r->cf);
         p_SetCoeff(p,d,r->cf);
         pIter(p);