Changeset e90881 in git for kernel/f5lists.cc

Timestamp:

Mar 29, 2009, 7:17:09 PM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

c6512c014a0813cb992533ab4dd571597c561ea4

Parents:

53e33d93f45a825808d84cade536120482dc46c3

Message:

implemented deletion of known useless polynomials before the interreduction of gprev takes place


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

File:

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

kernel/f5lists.cc

@@ -151 +151 @@
 }
 
+inline LNode* LNode::insertByLabel(LNode* l) {
+    //Print("ADDING SOLYS TO THE LIST\n");
+    //Print("new element: ");
+    //pWrite(t);
+       if(NULL == this) { // || NULL == data) {
+        l->next =   this;
+        return l;
+    }
+    else {
+         //Print("tested element1: ");
+    //pWrite(this->getTerm());
+        if(-1 == pLmCmp(l->getTerm(),this->getTerm())) {
+            //Print("HIERDRIN\n");
+            l->next =   this;
+            //Print("%p\n",this);
+            //Print("%p\n",newElement->next);
+            return l;
+        }
+        else {
+            LNode* temp = this;
+            while(NULL != temp->next && NULL != temp->next->data) {
+                //Print("tested element: ");
+                //pWrite(temp->getTerm());
+                if(-1 == pLmCmp(l->getTerm(),temp->next->getTerm())) {
+                    l->next     =   temp->next;
+                    temp->next  =   l;
+                    return this;
+                }
+                else {
+                    temp = temp->next;
+                    //Print("%p\n",temp);
+                    //Print("%p\n",temp->data);
+                    
+                    //Print("%p\n",temp->next);
+                }
+            }
+        //Print("HIER\n");
+            l->next     =   temp->next;
+            temp->next  =   l;
+            return this;
+        }
+    }
+}
+
 // deletes the first elements of the list with the same degree
 // only used for the S-polys, which are already sorted by increasing degree by CList
@@ -184 +228 @@
 }
 
+bool LNode::getDel() {
+    return data->getDel();
+}
+
 // set the data from the LPoly saved in LNode
 void LNode::setPoly(poly p) {
@@ -199 +247 @@
 void LNode::setNext(LNode* l) {
     next    =   l;
+}
+
+void LNode::setDel(bool d) {
+    data->setDel(d);
 }
 
@@ -229 +281 @@
         pWrite(temp->getPoly());
         Print("%p\n",temp->next);
+        Print("DELETE? %d\n",temp->getDel());
         temp = temp->next;
     }
@@ -234 +287 @@
 }
 
+int LNode::count(LNode* l) {
+    int nonDel  =   0;
+    LNode* temp =   l;
+    while(NULL != temp) {
+        if(!temp->getDel()) {
+            nonDel++;
+            temp    =   temp->next;
+        }
+        else {
+            temp    =   temp->next;
+        }
+    }
+    return nonDel;
+}
 
 /*
@@ -304 +371 @@
 
 void LList::insertByLabel(LNode* l) {
-    first = first->insertByLabel(l->getTerm(),l->getIndex(),l->getPoly(),l->getRule());
+    first = first->insertByLabel(l);
     length++;
     //Print("LENGTH %d\n",length);
@@ -340 +407 @@
 }
 
+int LList::count(LNode* l) {
+    return first->count(l);
+}
 /*
 =======================================