Changeset 512a2b in git for Singular/polys1.cc

Timestamp:

Sep 18, 2000, 11:19:39 AM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d1655e92ca71fb37d1b57af88efdff5b65b8988b

Parents:

f3398d316400fe1ee1677fc397cacb80566ac664

Message:

p_polys.h


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

File:

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

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.45 2000-09-12 16:01:12 obachman Exp $ */
+/* $Id: polys1.cc,v 1.46 2000-09-18 09:19:30 obachman Exp $ */
 
 /*
@@ -15 +15 @@
 #include "tok.h"
 #include "numbers.h"
-#include <omalloc.h>
+#include "omalloc.h"
 #include "febase.h"
 #include "weight.h"
@@ -302 +302 @@
     pMonMult(b,tail);
   }
-  pDelete1(&tail);
+  pDeleteLm(&tail);
   pNext(res) = b;
   pNext(b) = NULL;
@@ -313 +313 @@
 //   if(nIsZero(pGetCoeff(pNext(tail))))
 //   {
-//     pDelete1(&pNext(tail));
+//     pDeleteLm(&pNext(tail));
 //   }
 //   else
@@ -455 +455 @@
     if (pGetExp(a,k)!=0)
     {
-      f = pInit(a);
+      f = pLmInit(a);
       t = nInit(pGetExp(a,k));
       pSetCoeff0(f,nMult(t,pGetCoeff(a)));
       nDelete(&t);
       if (nIsZero(pGetCoeff(f)))
-        pDelete1(&f);
+        pDeleteLm(&f);
       else
       {
@@ -493 +493 @@
     {
       nDelete(&n);
-      pDelete1(&p);
+      pDeleteLm(&p);
       return NULL;
     }
@@ -653 +653 @@
     pSetCoeff0(rc,nInit(i));
     if (nIsZero(pGetCoeff(rc)))
-      pDelete1(&rc);
+      pDeleteLm(&rc);
   }
   return rc;
@@ -1016 +1016 @@
     if (nIsZero(pGetCoeff(qq)))
     {
-      pDelete1(&qq);
+      pDeleteLm(&qq);
     }
     else
@@ -1042 +1042 @@
           {
             /* this variable maps to 0 !*/
-            pDelete1(&qq);
+            pDeleteLm(&qq);
             break;
           }
@@ -1333 +1333 @@
   while ((p1 != NULL) && (p2 != NULL))
   {
-    /* p1 and p2 are non-NULL, so we may use pLmCmp instead of pComp */
     if (! pLmEqual(p1, p2))
-       return FALSE;
+      return FALSE;
+    if (! nEqual(pGetCoeff(p1), pGetCoeff(p2)))
+      return FALSE;
     pIter(p1);
     pIter(p2);
@@ -1350 +1351 @@
   number n,nn;
   int i;
-
-  if (!pEqual(p1,p2)) //compare leading mons
+  pAssume(p1 != NULL && p2 != NULL);
+  
+  if (!pLmEqual(p1,p2)) //compare leading mons
       return FALSE;
   if ((pNext(p1)==NULL) && (pNext(p2)!=NULL))
@@ -1362 +1364 @@
   while ((p1 != NULL) /*&& (p2 != NULL)*/)
   {
-    if ( ! pEqual(p1, p2))
+    if ( ! pLmEqual(p1, p2))
     {
         nDelete(&n);