Changeset 51c163 in git for Singular/polys1.cc

Timestamp:

Dec 3, 1997, 5:59:09 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

60b6009c05103f2e0954313a9eaf4212fbfb177c

Parents:

97eb91d6ede7d98085ea363e0cde94fa6a6913be

Message:

Wed Dec  3 16:14:51 1997  Olaf Bachmann
<obachman@mathematik.uni-kl.de>

	* Many changes to prepare for implementation of fast comparison
		  schemes: Here are only a few:
	- added file polys-impl.h which implements low-level poly stuff
	- removed file polys2.cc, added polys-impl.cc
	- added Singularp target to Make
	- prepared configure for setting of exponent type
	- got rid of as many direct p->exp[..] accesses as possible
	- added file spSpolyLoop.cc spSpolyLoop.h polys-comp.h
	* polys-impl.h: if you defined COMP_FAST, then fast polynomial
		  comparsions are eanbled (still needs a lot of debugging)


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

File:

• Singular/polys1.cc (modified) (16 diffs)

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.7 1997-10-20 10:52:03 Singular Exp $ */
+/* $Id: polys1.cc,v 1.8 1997-12-03 16:59:00 obachman Exp $ */
 
 /*
@@ -35 +35 @@
   int i;
 
-  for (i=pVariables;i>=0;i--)
+  for (i=pVariables;i;i--)
   {
     if (pGetExp(p,i)!=0) return FALSE;
   }
+  if (pGetComp(p)) return FALSE;
   return TRUE;
 }
@@ -83 +84 @@
   p->coef = nInit(1);
   return p;
-}
-
-/*2
-* creates a copy of p
-*/
-#ifdef MDEBUG
-poly pDBCopy(poly p,char *f,int l)
-#else
-poly pCopy(poly p)
-#endif
-{
-  poly w, a;
-
-  if (p==NULL) return NULL;
-  pDBTest(p,f,l);
-#ifdef MDEBUG
-  w = a = pDBNew(f,l);
-#else
-  w = a = pNew();
-#endif
-  memcpy(w,p,pMonomSize);
-  w->coef=nCopy(p->coef);
-  if (pNext(p)!=NULL)
-  {
-    pIter(p);
-    do
-    {
-#ifdef MDEBUG
-      a = pNext(a) = pDBNew(f,l);
-#else
-      a = pNext(a) = pNew();
-#endif
-      memcpy(a,p,pMonomSize);
-      a->coef=nCopy(p->coef);
-      pIter(p);
-    }
-    while (p!=NULL);
-  }
-  pNext(a) = NULL;
-  return w;
 }
 
@@ -319 +280 @@
   for (i=pVariables; i!=0; i--)
   {
-    pGetExp(p,i) *= exp;
+    pMultExp(p,i, exp);
   }
   p->Order *= exp;
@@ -340 +301 @@
   for (i=pVariables; i!=0; i--)
   {
-    pGetExp(p,i) += pGetExp(q,i);
+    pAddExp(p,i, pGetExp(q,i));
   }
   p->Order += q->Order;
@@ -357 +318 @@
   x = nMult(pGetCoeff(p),pGetCoeff(q));
   pSetCoeff0(r,x);
-  pGetComp(r) = pGetComp(p);
+  pSetComp(r, pGetComp(p));
   for (i=pVariables; i!=0; i--)
   {
-    pGetExp(r,i) = pGetExp(p,i) + pGetExp(q,i);
+    pSetExp(r,i, pGetExp(p,i) + pGetExp(q,i));
   }
   r->Order = p->Order + q->Order;
@@ -494 +455 @@
               for(j=1;j<=pdK;j++)
               {
-                if(p->exp[pdY(j)]!=0)
+                if(pGetExp(p,pdY(j))!=0)
                 {
                   pDelete(&rc);
@@ -502 +463 @@
               for(j=1;j<=pdN;j++)
               {
-                t=p->exp[pdX(j)];
-                p->exp[pdX(j)]=p->exp[pdIX(j)];
-                p->exp[pdIX(j)]=t;
+                t=pGetExp(p,pdX(j));
+                pGetExp(p,pdX(j)]=pGetExp(p,pdIX(j));
+                pGetExp(p,pdIX(j))=t;
               }
               pIter(p);
@@ -559 +520 @@
     {
       f = pNew();
+      pCopy2(f,a);
       pNext(f)=NULL;
       t = nInit(pGetExp(a,k));
@@ -567 +529 @@
       else
       {
-        memcpy4(f->exp,a->exp,(pVariables + 1) * sizeof(short));
-        f->exp[k]--;
+        pDecrExp(f,k);
         pSetm(f);
         if (res==NULL)
@@ -662 +623 @@
 
 /*2
-* returns (a copy of) the head term of a
-*/
-#ifdef MDEBUG
-poly pDBHead(poly p,char *f, int l)
-#else
-poly pHead(poly p)
-#endif
-{
-  poly w=NULL;
-
-  if (p!=NULL)
-  {
-#ifdef MDEBUG
-    w = pDBNew(f,l);
-#else
-    w = pNew();
-#endif
-    memcpy4(w,p,pMonomSize);
-    pSetCoeff0(w,nCopy(pGetCoeff(p)));
-    pNext(w) = NULL;
-  }
-  return w;
-}
-
-/*2
-* returns (a copy of) the head term of a without the coef
-*/
-#ifdef MDEBUG
-poly pDBHead0(poly p,char *f, int l)
-#else
-poly pHead0(poly p)
-#endif
-{
-  poly w=NULL;
-
-  if (p!=NULL)
-  {
-#ifdef MDEBUG
-    w = pDBNew(f,l);
-#else
-    w = pNew();
-#endif
-    memcpy4(w,p,pMonomSize);
-    pSetCoeff0(w,NULL);
-    pNext(w) = NULL;
-  }
-  return w;
-}
-
-/*2
 * returns maximal column number in the modul element a (or 0)
 */
@@ -757 +668 @@
     do
     {
-      pSetComp(p, (short)i);
+      pSetComp(p, (Exponent_t)i);
       pIter(p);
     } while (p!=NULL);
@@ -1007 +918 @@
       pTest(aq);
     }
-    qq->exp[0]=p->exp[0];
+    pSetComp(qq, pGetComp(p));
     if (nIsZero(pGetCoeff(qq)))
     {
@@ -1016 +927 @@
       for(i=1; i<=OldpVariables; i++)
       {
-        if (p->exp[i]!=0)
+        if (pGetExp(p,i)!=0)
         {
           if (perm==NULL)
           {
-            qq->exp[i]=p->exp[i];
+            pSetExp(qq,i, pGetExp(p,i));
           }
           else if (perm[i]>0)
-            qq->exp[perm[i]]+=p->exp[i];
+            pAddExp(qq,perm[i], pGetExp(p,i));
           else if (perm[i]<0)
           {
             lnumber c=(lnumber)pGetCoeff(qq);
-            c->z->e[-perm[i]-1]+=p->exp[i];
+            c->z->e[-perm[i]-1]+=pGetExp(p,i);
           }
           else
@@ -1307 +1218 @@
   while ((p1 != NULL) /*&& (p2 != NULL)*/)
   {
-    for (i=0; i<=pVariables; i++)
+    for (i=1; i<=pVariables; i++)
     {
       if (pGetExp(p1,i)!=pGetExp(p2,i))
@@ -1314 +1225 @@
         return FALSE;
       }
+    }
+    if (pGetComp(p1) != pGetComp(p2))
+    {
+      nDelete(&n);
+      return FALSE;
     }
     if (!nEqual(pGetCoeff(p1),nn=nMult(pGetCoeff(p2),n)))