Changeset 9bb97e in git for kernel/f5lists.cc

Timestamp:

Feb 6, 2009, 9:12:35 PM (14 years ago)

Author:

Christian Eder

Branches:

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

Children:

fcb80223d452f79f3b3e1a62b71d291a5fc64943

Parents:

b3e45f80f34104e744829011d4460dcee8e1e365

Message:

implementation of computeSPols, start of reduction and topReduction


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

File:

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

kernel/f5lists.cc

@@ -26 +26 @@
 
 // generating new list elements (labeled / classical polynomial / LNode view)
-LNode::LNode(LPoly* lp) {
+LNode::LNode() {
+    data = NULL;
+    next = NULL;
+}
+ LNode::LNode(LPoly* lp) {
     data = lp;
     next = NULL;
@@ -35 +39 @@
     next = l;
 }
-LNode::LNode(poly* t, int* i, poly* p) {
+LNode::LNode(poly t, int i, poly p) {
     LPoly* lp = new LPoly(t,i,p);
     data = lp;
@@ -41 +45 @@
 }
        
-LNode::LNode(poly* t, int* i, poly* p, LNode* l) {
+LNode::LNode(poly t, int i, poly p, LNode* l) {
     LPoly* lp = new LPoly(t,i,p);
     data = lp;
@@ -63 +67 @@
 }
         
-LNode* LNode::insert(poly* t, int* i, poly* p) {
+LNode* LNode::insert(poly t, int i, poly p) {
     LNode* newElement = new LNode(t, i, p, this);
     return newElement;
@@ -70 +74 @@
 // 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)
-LNode* LNode::insertByLabel(LPoly* lp) {
-    if( lp->getTerm() <= this->data->getTerm() ) {
-        LNode* newElement   =   new LNode(lp, this);
+LNode* LNode::insertByLabel(poly t, int i, poly p) {
+    if(0 == pLmCmp(t,this->getTerm()) || -1 == pLmCmp(t,this->getTerm())) {
+        LNode* newElement   =   new LNode(t, i, p, this);
         return newElement;
     }
     else {
         LNode* temp = this;
-        while( NULL != temp->next ) {
-            if( lp->getTerm() <= temp->next->data->getTerm() ) {
-                LNode* newElement   =   new LNode(lp, temp->next);
+        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, temp->next);
                 temp->next          =   newElement;
                 return this;
@@ -87 +91 @@
             }
         }
-        LNode* newElement   =   new LNode(lp, NULL);
+        LNode* newElement   =   new LNode(t, i, p, NULL);
         temp->next          =   newElement;
         return this;
@@ -120 +124 @@
 int LNode::getIndex() {
     return data->getIndex();
+}
+
+bool LNode::getDel() {
+    return data->getDel();
+}
+
+// set the data from the LPoly saved in LNode
+void LNode::setPoly(poly p) {
+    data->setPoly(p);
+}
+
+void LNode::setTerm(poly t) {
+    data->setTerm(t);
+}
+
+void LNode::setIndex(int i) {
+    data->setIndex(i);
+}
+
+void LNode::setDel(bool d) {
+    data->setDel(d);
 }
 
@@ -144 +169 @@
 */
 
+LList::LList() {
+    first   =   new LNode();
+    length  =   0;
+}
+
 LList::LList(LPoly* lp) {
-    first   = new LNode(lp);
-}
-
-LList::LList(poly* t,int* i,poly* p) {
-    first   = new LNode(t,i,p);
+    first   =   new LNode(lp);
+    length  =   1;
+}
+
+LList::LList(poly t,int i,poly p) {
+    first   =   new LNode(t,i,p);
+    length  =   1;
 } 
 
@@ -159 +191 @@
 void LList::insert(LPoly* lp) {
     first = first->insert(lp);
-}
-
-void LList::insert(poly* t,int* i, poly* p) {
+    length++;
+}
+
+void LList::insert(poly t,int i, poly p) {
     first = first->insert(t,i,p);
-}
-
-void LList::insertByLabel(LPoly* lp) {
-    first = first->insertByLabel(lp);
+    length++;
+}
+
+void LList::insertByLabel(poly t, int i, poly p) {
+    first = first->insertByLabel(t,i,p);
+    length++;
 }
 
@@ -183 +218 @@
 LNode* LList::getNext(LNode* l) {
     return l->getNext();
+}
+
+int LList::getLength() {
+    return length;
 }
 
@@ -299 +338 @@
             if(0 == pLmCmp(u1,ppMult_qq(this->data->getT1(), this->data->getLp1Term())) ||
                -1 == pLmCmp(u1,ppMult_qq(this->data->getT1(), this->data->getLp1Term()))) {
-                Print("Leck mich am Arsch: ");
                 pWrite(u1);
                 Print("Multi-Term in CritPairs Sortierung altes Element: ");
@@ -386 +424 @@
     CNode* temp = this;
     while( NULL != temp->data ) {
-        while( temp->next->data->getDeg() == this->data->getDeg() ) {
+        while(NULL != temp->next->data && temp->next->data->getDeg() == this->data->getDeg()) {
             temp = temp->next;
         }
         CNode* returnCNode  =   temp->next;    
-        temp->next          =   NULL;
+        // every CList should end with a (NULL,NULL) element for a similar behaviour 
+        // using termination conditions throughout the algorithm
+        temp->next          =   new CNode();
         return returnCNode;
     }
     return NULL;
+}
+
+CPair* CNode::getData() {
+    return data;
+}
+
+CNode* CNode::getNext() {
+    return next;
+}
+
+LPoly* CNode::getAdLp1() {
+    return this->data->getAdLp1();
+}
+
+LPoly* CNode::getAdLp2() {
+    return this->data->getAdLp2();
 }
 
@@ -424 +480 @@
 }
 
+poly* CNode::getAdT1() {
+    return this->data->getAdT1();
+}
+
 poly CNode::getT2() {
     return this->data->getT2();
+}
+
+poly* CNode::getAdT2() {
+    return this->data->getAdT2();
+}
+
+Rule* CNode::getLastRuleTested() {
+    return this->data->getLastRuleTested();
 }
 
@@ -472 +540 @@
 }
 
+CNode* CList::getFirst() {
+    return first;
+}
+
 // get the first elements from CList which by the above sorting have minimal degree
 // returns the pointer on the first element of those
@@ -510 +582 @@
 }
 
+RNode* RNode::insert(int i, poly t, LPoly* l) {
+    Rule*   r           =   new Rule(i,t,l);
+    RNode* newElement   =   new RNode(r);
+    newElement->next    =   this;
+    return newElement;
+}
+
 RNode* RNode::getNext() {
     return next;
@@ -537 +616 @@
 RList::RList(Rule* r) {
     first = new RNode(r);
+}
+
+void RList::insert(int i, poly t, LPoly* l) {
+    first = first->insert(i,t,l);
 }