Changeset 512a2b in git for Singular/pInline2.h

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/pInline2.h (modified) (7 diffs)

Singular/pInline2.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline2.h,v 1.3 2000-09-14 13:04:39 obachman Exp $
+ *  Version: $Id: pInline2.h,v 1.4 2000-09-18 09:19:24 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE2_H
@@ -22 +22 @@
 #include "omalloc.h"
 #include "structs.h"
-#include "polys.h"
+#include "p_polys.h"
 #include "numbers.h"
 #include "p_Procs.h"
@@ -30 +30 @@
 {
   p_CheckPolyRing2(p, r);
-  p_nDelete(&(p->coef), r);
+  n_Delete(&(p->coef), r);
   (p)->coef=n;
   return n;
@@ -178 +178 @@
 }
 
-PINLINE2 void p_Delete1(poly *p, ring r)
+PINLINE2 void p_DeleteLm(poly *p, ring r)
 {
   pIfThen2(*p != NULL, p_CheckPolyRing2(*p, r));
@@ -184 +184 @@
   if (h != NULL)
   {
-    p_nDelete(&_pGetCoeff(h), r);
+    n_Delete(&_pGetCoeff(h), r);
     *p = _pNext(h);
     omFreeBinAddr(h);
   }
-
-}
-PINLINE2 void p_Free(poly p, ring r)
+}
+PINLINE2 void p_DeleteLm(poly p, ring r)
+{
+  pIfThen2(p != NULL, p_CheckPolyRing2(p, r));
+  if (p != NULL)
+  {
+    n_Delete(&_pGetCoeff(p), r);
+    omFreeBinAddr(p);
+  }
+}
+PINLINE2 void p_LmFree(poly p, ring r)
 {
   p_CheckPolyRing2(p, r);
   omFreeBinAddr(p);
 }
-PINLINE2 poly p_FreeAndNext(poly p, ring r)
-{
-  p_CheckPolyRing2(p, r);
-  poly pnext = _pNext(p);
+PINLINE2 void p_LmFree(poly *p, ring r)
+{
+  p_CheckPolyRing2(*p, r);
+  poly h = *p;
+  *p = pNext(h);
+  omFreeBinAddr(h);
+}
+PINLINE2 poly p_LmFreeAndNext(poly p, ring r)
+{
+  p_CheckPolyRing2(p, r);
+  poly pnext = pNext(p);
   omFreeBinAddr(p);
   return pnext;
@@ -205 +220 @@
 {
   p_CheckPolyRing2(p, r);
-  p_nDelete(&_pGetCoeff(p), r);
+  n_Delete(&_pGetCoeff(p), r);
   omFreeBinAddr(p);
 }
+PINLINE2 void p_LmDelete(poly *p, ring r)
+{
+  p_CheckPolyRing2(*p, r);
+  poly h = *p;
+  *p = pNext(h);
+  n_Delete(&pGetCoeff(h), r);
+  omFreeBinAddr(h);
+}
 PINLINE2 poly p_LmDeleteAndNext(poly p, ring r)
 {
   p_CheckPolyRing2(p, r);
   poly pnext = _pNext(p);
-  p_nDelete(&_pGetCoeff(p), r);
+  n_Delete(&_pGetCoeff(p), r);
   omFreeBinAddr(p);
   return pnext;
@@ -369 +392 @@
   int shorter;
   number n_old = pGetCoeff(m);
-  number n_neg = p_nCopy(n_old, r);
-  n_neg = p_nNeg(n_neg, r);
+  number n_neg = n_Copy(n_old, r);
+  n_neg = n_Neg(n_neg, r);
   pSetCoeff0(m, n_neg);
 
   res = r->p_Procs->p_Minus_mm_Mult_qq(p, m, q, shorter, NULL, r);
   pSetCoeff0(m, n_old);
-  p_nDelete(&n_neg, r);
+  n_Delete(&n_neg, r);
   return res;
 }