Changeset 70c15e in git for kernel/f5lists.cc

Timestamp:

Feb 22, 2009, 7:58:36 PM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

6d5e7ee005c7a5c9c97446227e1b19c6ed68fc9a

Parents:

d8be851dd8f2cf657611debe1b34b05aedcdf65d

Message:

problem in cyclic_n(4) solved


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

File:

• kernel/f5lists.cc (modified) (2 diffs)

kernel/f5lists.cc

@@ -101 +101 @@
 // only used for the S-polys to be reduced (TopReduction building new S-polys with higher label)
 LNode* LNode::insertByLabel(poly t, int i, poly p, Rule* r) {
-    if(0 == pLmCmp(t,this->getTerm()) || -1 == pLmCmp(t,this->getTerm())) {
+    if(NULL == data) {
         LNode* newElement   =   new LNode(t, i, p, r, this);
         return newElement;
     }
     else {
-        LNode* temp = this;
-        while( NULL != temp->next->data ) {
-            if( 0 == pLmCmp(t,temp->next->getTerm()) || -1 == pLmCmp(t,temp->next->getTerm())) {
-                LNode* newElement   =   new LNode(t, i, p, r, temp->next);
-                temp->next          =   newElement;
-                return this;
+        if(0 == pLmCmp(t,this->getTerm()) || -1 == pLmCmp(t,this->getTerm())) {
+            LNode* newElement   =   new LNode(t, i, p, r, this);
+            return newElement;
+        }
+        else {
+            LNode* temp = this;
+            while(NULL != temp->next && NULL != temp->next->data) {
+                if( 0 == pLmCmp(t,temp->next->getTerm()) || -1 == pLmCmp(t,temp->next->getTerm())) {
+                    LNode* newElement   =   new LNode(t, i, p, r, temp->next);
+                    temp->next          =   newElement;
+                    return this;
+                }
+                else {
+                    temp = temp->next;
+                    Print("%p\n",temp);
+                    Print("%p\n",temp->data);
+                    
+                    Print("%p\n",temp->next);
+                }
             }
-            else {
-                temp = temp->next;
-            }
+        Print("HIER\n");
+            LNode* newElement   =   new LNode(t, i, p, r, temp->next);
+            temp->next          =   newElement;
+            return this;
         }
-        LNode* newElement   =   new LNode(t, i, p, r, NULL);
-        temp->next          =   newElement;
-        return this;
     }
 }
@@ -197 +208 @@
     LNode* temp = this;
     Print("___________________List of S-polynomials______________________:\n");
-    while(NULL != temp->data) {
+    while(NULL != temp && NULL != temp->data) {
+        Print("HIER\n");
         Print("Index: %d\n",temp->getIndex());
         Print("Term: ");