Changeset f5d749 in git

Timestamp:

Dec 5, 2000, 2:01:11 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

e6243c52793c81123253d462d4029d506b6c7456

Parents:

9f9b9a1a665602bf82b5e271e8cc596d26f25203

Message:

* update


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

Location:

Singular

Files:

• pInline1.h (modified) (4 diffs)
• pInline2.h (modified) (2 diffs)
• p_kBucketSetLm__Template.cc (modified) (2 diffs)

Singular/pInline1.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline1.h,v 1.13 2000-11-03 14:50:19 obachman Exp $
+ *  Version: $Id: pInline1.h,v 1.14 2000-12-05 13:01:11 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE1_H
@@ -99 +99 @@
   omTypeAlloc0Bin(poly, p, bin);
   p_MemAdd_NegWeightAdjust(p, r);
-  p_SetRingOfPoly(p, r);
+  p_SetRingOfLm(p, r);
   return p;
 }
@@ -112 +112 @@
   poly np;
   omTypeAllocBin(poly, np, r->PolyBin);
-  p_SetRingOfPoly(np, r);
+  p_SetRingOfLm(np, r);
   p_ExpVectorCopy(np, p, r);
   _pNext(np) = NULL;
@@ -146 +146 @@
   poly np;
   omTypeAllocBin(poly, np, r->PolyBin);
-  p_SetRingOfPoly(np, r);
+  p_SetRingOfLm(np, r);
   p_ExpVectorCopy(np, p, r);
   _pNext(np) = NULL;

Singular/pInline2.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline2.h,v 1.21 2000-12-05 12:14:32 obachman Exp $
+ *  Version: $Id: pInline2.h,v 1.22 2000-12-05 13:01:11 obachman Exp $
  *******************************************************************/
 #ifndef PINLINE2_H
@@ -216 +216 @@
   poly p;
   omTypeAllocBin(poly, p, bin);
-  p_SetRingOfPoly(p, r);
+  p_SetRingOfLm(p, r);
   return p;
 }

Singular/p_kBucketSetLm__Template.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_kBucketSetLm__Template.cc,v 1.1 2000-11-28 11:50:56 obachman Exp $
+ *  Version: $Id: p_kBucketSetLm__Template.cc,v 1.2 2000-12-05 13:01:11 obachman Exp $
  *******************************************************************/
 
@@ -29 +29 @@
       {
         p =  bucket->buckets[j];
-        if (j == 0) goto Greater;
+        if (j == 0)
+        {
+          if (p != NULL) goto Greater;
+          j = i;
+          goto Continue;
+        }
+        assume(p != NULL);
         p_MemCmp(bucket->buckets[i]->exp, p->exp, length, ordsgn, goto Equal, goto Greater, goto Continue);
 
         Greater:
         {
-          if (j > 0 && p != NULL && n_IsZero(pGetCoeff(p), r))
+          if (n_IsZero(pGetCoeff(p), r))
           {
             n_Delete(&pGetCoeff(p), r);