Changeset 787685 in git for kernel/f5lists.cc

Timestamp:

May 14, 2009, 10:47:01 AM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

cef7eedebae73877347e466c8c9eea48e5da8b11

Parents:

21cb46b885ab1b05f213bba73b625f4c6a4ad9e8

Message:

insertion of rules ordered by their monomials, bit slower than without sorting


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

File:

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

kernel/f5lists.cc

@@ -880 +880 @@
     newElement->next    =   this;
     return newElement;
-    
-    /*
-     * not useful, as it does not only adds new rules to be tested but also
-     * deletes rules to be tested if a rule is set to another place in the line
-     *
-    if(NULL == this || this->getRuleIndex() < newElement->getRuleIndex()) {
-        newElement->next    =   this;
+}
+
+
+RNode* RNode::insertOrdered(Rule* r) {
+    RNode* newElement   =   new RNode(r); 
+    RNode* temp         =   this;
+    if(NULL == temp) {
+        newElement->next =   temp;
+        return newElement;
+    }
+    if(1 == pLmCmp(newElement->getRuleTerm(),temp->getRuleTerm())) {
+        newElement->next =   temp;
+        return newElement;
     }
     else {
-        if(pDeg(newElement->getRuleTerm()) > pDeg(this->getRuleTerm())) {
-                newElement->next    =   this;
-        }
-        if(-1 == pLmCmp(newElement->getRuleTerm(),this->getRuleTerm())) {
-            Print("HAHI\n");
-            Print("%ld\n",pDeg(newElement->getRuleTerm()));
-            Print("%ld\n",pDeg(this->getRuleTerm()));
-            
-            pWrite(newElement->getRuleTerm());
-            pWrite(this->getRuleTerm());
-            RNode* temp    =   this;
-            while(NULL != temp->next && pDeg(newElement->getRuleTerm()) <= pDeg(temp->next->getRuleTerm())
-                    && -1 == pLmCmp(newElement->getRuleTerm(),temp->next->getRuleTerm())) {
-                temp    =   temp->next;
-            }
-            newElement->next    =   temp->next;
-            temp->next          =   newElement;
-            return this;
-        }
-        else {
-            newElement->next    =   this;
-            return newElement;
-        }
-    }
-    return newElement;
-    */
-}
+        while(NULL != temp && 1 ==  pLmCmp(temp->getRuleTerm(),newElement->getRuleTerm())) {
+            temp    =   temp->getNext();
+            Print("HIER\n");
+        }
+        newElement->next =   temp;
+        return this;
+    }
+}
+
 
 RNode* RNode::getNext() {
@@ -981 +969 @@
 }
 
+void RList::insertOrdered(Rule* r) {
+    first   =   first->insertOrdered(r);
+}
+
 RNode* RList::getFirst() {
     return first;