Changeset 1534d9 in git for kernel/f5lists.cc

Timestamp:

Mar 16, 2009, 8:28:07 PM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

febf7e79089257c80bba7e793dd2fb03af40b285

Parents:

bc103b1993b606247dbfebaa278db1467ca2c15b

Message:

changed data structure RList, sorted insertion of rules, still problems with degree of monomials of rules


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

File:

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

kernel/f5lists.cc

@@ -666 +666 @@
         Print("T1: ");
         pWrite(temp->getT1());
+        Print("%p\n",temp->getT1());
         Print("LP1 Term: ");
         pWrite(temp->getLp1Term());
@@ -673 +674 @@
         Print("T2: ");
         pWrite(temp->getT2());
+        Print("%p\n",temp->getT2());
         Print("LP2 Term: ");
         pWrite(temp->getLp2Term());
@@ -762 +764 @@
     //Print("ADDRESS OF RNODE: %p\n",newElement);
     //Print("ADDRESS OF RNODE DATA: %p\n",newElement->getRule());
-    newElement->next    =   this;
+    if(NULL == this || this->getRuleIndex() < newElement->getRuleIndex()) {
+        newElement->next    =   this;
+    }
+    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;
 }
@@ -788 +817 @@
 */
 RList::RList() {
-    first = new RNode();
+    first = NULL;
 }
 
@@ -798 +827 @@
     RNode* temp;
     //Print("%p\n",first);
-    while(first->getRule()) {
+    while(first) {
         temp    =   first;
         first   =   first->getNext();