Changeset ab76b4 in git for kernel/f5lists.cc

Timestamp:

Mar 8, 2010, 11:49:06 AM (13 years ago)

Author:

Christian Eder

Branches:

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

Children:

c1a5fdccad23660f683eef44f4ca207fa4050c1c

Parents:

56b0c82650ffab78c72a5629796b5fe751482448

Message:

latest F5 version including F5,F5R,F5C & F5+

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

File:

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

kernel/f5lists.cc

@@ -19 +19 @@
 #include "f5lists.h"
 
+/**
+ * functions working on the class PNode
+ */
+PNode::PNode(poly p, PNode* n) {
+  data  = p;
+  next  = n;
+}
+
+poly PNode::getPoly() {
+  return this->data;
+}
+
+PNode* PNode::getNext() {
+  return this->next;
+}
+PNode* PNode::insert(poly p) {
+  poly q = pOne();
+  q = pCopy(p); 
+  PNode* temp = this;
+  if(NULL == temp) {
+    PNode* pn = new PNode(q,temp);
+    return pn;
+  }
+  if(1 == pLmCmp(q,temp->getPoly())) {
+    PNode* pn = new PNode(q,temp);
+    return pn;
+  }
+  if(0 == pLmCmp(q,temp->getPoly())) {
+    return this;
+  }
+  if(-1 == pLmCmp(q,temp->getPoly())) {
+    while(NULL != temp->getNext() && -1 == pLmCmp(q,temp->getNext()->getPoly())) {
+      temp = temp->getNext();
+    }
+    if(NULL == temp->getNext() || 1 == pLmCmp(q,temp->getNext()->getPoly())) {
+      PNode* pn = new PNode(q,temp->getNext());
+      temp->next = pn;
+      return this;
+    }
+    if(0 == pLmCmp(q,temp->getNext()->getPoly())) {
+      return this;
+    }
+  }
+}
+/*
+PNode* PNode::insert(poly p) {
+  PNode* pn = new PNode(p,this);
+  return pn;
+}
+*/
+/**
+ * functions working on the class PList
+ */
+PList::PList() {
+  first = NULL;
+}
+
+
+void PList::insert(poly p) {
+  first = first->insert(p);
+}
+  
+
+/*
+PNode* PList::insert(poly p) {
+  PNode* temp = first;
+  PNode* pn   = new PNode(p,temp);
+  first       = pn;
+  return first;
+}
+*/
+bool PList::check(poly p) {
+  PNode* temp = first;
+  //Print("\nCHECK: \n");
+  //pWrite(p);
+  //Print("-----\n");
+  while(NULL != temp) {
+    //pWrite(temp->getPoly());
+    //pWrite(p);
+    //Print("COMAPRE: %d\n",pLmEqual(p,temp->getPoly()));
+    if(1 == pLmEqual(p,temp->getPoly())) {
+      //Print("YES!\n");
+      //pWrite(pHead(temp->getPoly()));
+      //Print("YES!\n");
+      return 1;
+    }
+    temp = temp->getNext();
+  }
+  //Print("NOTHING!\n");
+  return 0;
+}
+
+void PList::print() {
+  Print("-----LIST-----\n");
+  PNode* temp = first;
+  while(NULL != temp) {
+    pWrite(temp->getPoly());
+    temp = temp->getNext();
+  }
+}
 /*
 ====================================
@@ -293 +393 @@
     LNode* temp = this;
     Print("___________________List of S-polynomials______________________:\n");
-    Print("%p\n",this);
     while(NULL != temp && NULL != temp->data) {
         Print("Index: %d\n",temp->getIndex());
@@ -300 +399 @@
         Print("Poly: ");
         pWrite(temp->getPoly());
-        Print("%p\n",temp->getPoly());
-        Print("DELETE? %d\n",temp->getDel());
         temp = temp->next;
     }
@@ -695 +792 @@
 }
 
+
+CNode* CNode::insertWithoutSort(CPairOld* cp) {
+    CNode* newElement = new CNode(cp);
+    newElement->next  = this;
+    return newElement;
+}
+
+
 // get the first elements from CListOld which by the above sorting have minimal degree
 CNode* CNode::getMinDeg() {
@@ -831 +936 @@
 }
 
+void CListOld::insertWithoutSort(CPairOld* c) {
+    first = first->insertWithoutSort(c);
+}
+
 CNode* CListOld::getFirst() {
     return first;