Changeset d51339 in git for kernel/f5lists.cc

Timestamp:

Feb 18, 2009, 9:43:05 PM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

eab144e3329d02244a62975d1bb6e77d4754f131

Parents:

93a7f7b1c20c3c886dd4dff521c518039f3824e7

Message:

new written reduction process, still problems getting the right rules in criterion2()
->lastRuleTested shouldnt be part of the CPair as it is a characteristic of an LPoly


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

File:

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

kernel/f5lists.cc

@@ -70 +70 @@
 }
        
-// insert new elements to the list always in front (labeled / classical polynomial view)
+// insert new elements to the list always at the end (labeled / classical polynomial view)
+// needed for list gPrev
 LNode* LNode::insert(LPoly* lp) {
-    Print("HIER\n");
-    LNode* newElement = new LNode(lp, this);
+    Print("INSERTION: \n");
+    Print("LAST GPREV: ");
+    pWrite(this->getPoly());
+LNode* newElement   =   new LNode(lp, NULL);
+    this->next          =   newElement;
     return newElement;
 }
         
 LNode* LNode::insert(poly t, int i, poly p, Rule* r) {
-    LNode* newElement = new LNode(t, i, p, r, NULL, this);
+    LNode* newElement   =   new LNode(t, i, p, r, NULL, NULL);
+    this->next          =   newElement;
     return newElement;
 }
 
-LNode* LNode::append(poly t, int i, poly p, Rule* r) {
-    LNode* newElement   =   new LNode(t,i,p,r,NULL);
-    this->next          =   newElement;
-}
-
+// insert new elements to the list always in front (labeled / classical polynomial view)
+// needed for sPolyList
+LNode* LNode::insertSP(LPoly* lp) {
+    LNode* newElement   =   new LNode(lp, this);
+    return newElement;
+}
+        
+LNode* LNode::insertSP(poly t, int i, poly p, Rule* r) {
+    LNode* newElement   =   new LNode(t, i, p, r, NULL, this);
+    return newElement;
+}
 // insert new elemets to the list w.r.t. increasing labels
 // only used for the S-polys to be reduced (TopReduction building new S-polys with higher label)
@@ -122 +133 @@
     return next;
 }
-        
+
 // get the LPoly* out of LNode*
 LPoly* LNode::getLPoly() {
@@ -182 +193 @@
 }
 
+// for debugging
+void LNode::print() {
+    LNode* temp = this;
+    Print("___________________List of S-polynomials______________________:\n");
+    while(NULL != temp->data) {
+        Print("Index: %d\n",temp->getIndex());
+        Print("Term: ");
+        pWrite(temp->getTerm());
+        Print("Poly: ");
+        pWrite(temp->getPoly());
+        Print("\n");
+        temp = temp->next;
+    }
+}
+
+
 /*
 ====================================
@@ -210 +237 @@
 }
 
-// insertion in front of the list
+// insertion at the end of the list, needed for gPrev
 void LList::insert(LPoly* lp) {
-    first = first->insert(lp);
+    last = last->insert(lp);
+    Print("NEW LAST GPREV: ");
+    pWrite(last->getPoly());
     length++;
+    Print("LENGTH %d\n",length);
 }
 
 void LList::insert(poly t,int i, poly p, Rule* r) {
-    first = first->insert(t,i,p,r);
+    last = last->insert(t,i,p,r);
     length++;
-}
-
-void LList::append(poly t, int i, poly p, Rule* r) {
-    last    =   last->append(t,i,p,r);
+    Print("LENGTH %d\n",length);
+}
+
+// insertion in front of the list, needed for sPolyList
+void LList::insertSP(LPoly* lp) {
+    first = first->insertSP(lp);
     length++;
-}
+    Print("LENGTH %d\n",length);
+}
+
+void LList::insertSP(poly t,int i, poly p, Rule* r) {
+    first = first->insertSP(t,i,p,r);
+    length++;
+    Print("LENGTH %d\n",length);
+}
+
 
 void LList::insertByLabel(poly t, int i, poly p, Rule* r) {
     first = first->insertByLabel(t,i,p,r);
     length++;
+    Print("LENGTH %d\n",length);
 }
 
@@ -234 +275 @@
     first = first->insertByLabel(l->getTerm(),l->getIndex(),l->getPoly(),l->getRule());
     length++;
+    Print("LENGTH %d\n",length);
 }
 
@@ -252 +294 @@
 }
 
-LNode* LList::getNext(LNode* l) {
-    return l->getNext();
-}
-
 int LList::getLength() {
     return length;
@@ -261 +299 @@
 
 void LList::setFirst(LNode* l) {
-    LNode* temp =   first;
     first       =   l;
-    delete(temp);
     length--;
 }
 
-
+void LList::print() {
+    first->print();
+}
 
 /*
@@ -302 +340 @@
 LNode* LTagNode::getLNode() {
     return this->data;
+}
+
+LTagNode* LTagNode::getNext() {
+    return next;
 }
 
@@ -329 +371 @@
 LTagList::LTagList() {
     LTagNode* first =   new LTagNode();
+    
     length          =   0;
 }
@@ -343 +386 @@
 }
 
+void LTagList::setFirstCurrentIdx(LNode* l) {
+    firstCurrentIdx =   l;
+}
+
 LNode* LTagList::get(int idx) {
     return first->get(idx, length);
@@ -351 +398 @@
 }
 
+LNode* LTagList::getFirstCurrentIdx() {
+    return firstCurrentIdx;
+}
 
 /*
@@ -579 +629 @@
 void CNode::print() {
     CNode* temp = this;
-    Print("List of critical pairs:\n");
+    Print("___________________List of critical pairs______________________:\n");
     while(NULL != temp->data) {
-        Print("Index: %d\n",temp->getLp1Index());
+        Print("LP1 Index: %d\n",temp->getLp1Index());
         Print("T1: ");
         pWrite(temp->getT1());
-        Print("Lp1 Term: ");
+        Print("LP1 Term: ");
         pWrite(temp->getLp1Term());
-        Print("%d\n",temp->getLp2Index());
+        Print("LP1 Poly: ");
+        pWrite(temp->getLp1Poly());
+        Print("LP2 Index: %d\n",temp->getLp2Index());
+        Print("T2: ");
         pWrite(temp->getT2());
+        Print("LP2 Term: ");
         pWrite(temp->getLp2Term());
+        Print("LP2 Poly: ");
+        pWrite(temp->getLp2Poly());
         Print("\n");
         temp = temp->next;
     }
+}
+
+void CNode::setLastRuleTested(Rule* r) {
+    data->setLastRuleTested(r);
 }