Changeset 0179d5 in git for kernel/f5lists.cc

Timestamp:

Jul 16, 2009, 9:47:51 AM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

4feee0a979cff0b1422136e2611e127a8267eb8d

Parents:

d4f44f4f228fbb8258ce8e9927141d37d4470719

Message:

options for switching between F5, F5R and F5C: "0" = F5, "1" = F5R, "2" = F5C, ""(no option set at all) = F5C
this version only produces top reductions


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

File:

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

kernel/f5lists.cc

@@ -212 +212 @@
 
 // deletes the first elements of the list with the same degree
-// only used for the S-polys, which are already sorted by increasing degree by CList
+// only used for the S-polys, which are already sorted by increasing degree by CListOld
 LNode*  LNode::deleteByDeg() {
     return this;
@@ -583 +583 @@
 }
 
-CNode::CNode(CPair* c) {
+CNode::CNode(CPairOld* c) {
     data    =   c;   
     next    =   NULL;    
 }
 
-CNode::CNode(CPair* c, CNode* n) {
+CNode::CNode(CPairOld* c, CNode* n) {
     data    =   c;   
     next    =   n;    
@@ -601 +601 @@
 // working only with linked, but not doubly linked lists due to memory usage we have to check the 
 // insertion around the first element separately from the insertion around all other elements in the list
-CNode* CNode::insert(CPair* c) {
+CNode* CNode::insert(CPairOld* c) {
     if(NULL == this) {
         CNode* newElement   =   new CNode(c, this);
@@ -695 +695 @@
 }
 
-// get the first elements from CList which by the above sorting have minimal degree
+// get the first elements from CListOld which by the above sorting have minimal degree
 CNode* CNode::getMinDeg() {
     CNode* temp = this;
@@ -703 +703 @@
         }
         CNode* returnCNode  =   temp->next;    
-        // every CList should end with a (NULL,NULL) element for a similar behaviour 
+        // every CListOld should end with a (NULL,NULL) element for a similar behaviour 
         // using termination conditions throughout the algorithm
         temp->next          =   NULL;
@@ -711 +711 @@
 }
 
-CPair* CNode::getData() {
+CPairOld* CNode::getData() {
     return data;
 }
@@ -800 +800 @@
 /*
 ====================================
-functions working on the class CList
+functions working on the class CListOld
 ====================================
 */
-// for initialization of CLists, last element alwas has data=NULL and next=NULL
-CList::CList() {
+// for initialization of CListOlds, last element alwas has data=NULL and next=NULL
+CListOld::CListOld() {
     first   =   NULL;
 }
 
-CList::CList(CPair* c) {
+CListOld::CListOld(CPairOld* c) {
     first   =   new CNode(c);
 }
 
-CList::~CList() {
+CListOld::~CListOld() {
     CNode* temp;
     while(NULL != first) {
@@ -823 +823 @@
 // insert sorts the critical pairs firstly by increasing total degree, secondly by increasing label
 // note: as all critical pairs have the same index here, the second sort is done on the terms of the labels
-void CList::insert(CPair* c) {
+void CListOld::insert(CPairOld* c) {
     first = first->insert(c);
 }
 
-CNode* CList::getFirst() {
+CNode* CListOld::getFirst() {
     return first;
 }
 
-// get the first elements from CList which by the above sorting have minimal degree
+// get the first elements from CListOld which by the above sorting have minimal degree
 // returns the pointer on the first element of those
-CNode* CList::getMinDeg() {
+CNode* CListOld::getMinDeg() {
     CNode* temp     =   first;
     first           =   first->getMinDeg();
@@ -839 +839 @@
 }
 
-void CList::print() {
+void CListOld::print() {
     first->print();
 }