Changeset cce6ed3 in git for kernel/lists.h

Timestamp:

Jan 25, 2009, 6:13:06 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f4e338f564fc725c8dac99c44cbf3f5ec5ceacb2

Parents:

0883ed62762dee5f6c5fa37f064d3883b99dc21f

Message:

lists done, started implementing f5incremental and critpair subalgorithms


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

File:

• kernel/lists.h (modified) (8 diffs)

kernel/lists.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: lists.h,v 1.3 2009-01-15 17:44:24 ederc Exp $ */
+/* $Id: lists.h,v 1.4 2009-01-25 17:13:06 ederc Exp $ */
 /*
 * ABSTRACT: list interface
@@ -24 +24 @@
 class CNode;
 class CList;
-
+class RList;
+class RNode;
 
 /*
@@ -41 +42 @@
                 LNode(LNode* ln);
                 ~LNode();
-        // append new elements to the list from the labeled / classical polynomial view
+        // insert new elements to the list in first place from the labeled / classical polynomial view
         LNode*  insert(LPoly* lp);
         LNode*  insert(poly* t, int* i, poly* p);
+        // insert new elements to the list with resp. to increasing labels
+        // only used for the S-polys to be reduced (TopReduction building new S-polys with higher label)
+        LNode*  insertByLabel(LPoly* lp);
+        // deletes the first elements of the list with the same degree
         // get next from current LNode
         LNode*  getNext();
-        
+        // only used for the S-polys, which are already sorted by increasing degree by CList
+        LNode*  deleteByDeg();
         // get the LPoly* out of LNode*
         LPoly*  getLPoly();
-        // get the address of the polynomial part of LPoly* of LNode*
+        // get the data from the LPoly saved in LNode
         poly*   getPoly();
+        poly*   getTerm();
+        int*    getIndex();
         // test if for any list element the polynomial part of the data is equal to *p
         bool    polyTest(poly* p);
+        LNode*  getNext(LNode* l);
 };
 
@@ -64 +73 @@
     private:
         LNode*  first;
-        int     length;
     public:
                 LList(LPoly* lp);
@@ -72 +80 @@
         // insertion in front of the list
         void    insert(poly* t,int* i, poly* p);
+        void    insertByLabel(LPoly* lp);
+        void    deleteByDeg();
         bool    polyTest(poly* p);
-        int     getLength() const;
-        LNode*  getFirst();
+        LNode*  getFirst(); 
+        LNode*  getNext(LNode* l);
 };
 
@@ -115 +125 @@
 /*
 =======================================
-CNode class (nodes for lists of CPairs)
+class CNode (nodes for lists of CPairs)
 =======================================
 */
@@ -126 +136 @@
                 ~CNode(); 
         CNode*  insert(CPair* c); 
-        CNode*  getLPoly() const; 
+        CNode*  getMinDeg();
+        //CNode*  getLPoly() const; 
 };
 
 
 /*
-=============================
-class CPList(lists of CPairs)
-=============================
+============================
+class CList(lists of CPairs)
+============================
 */
 class CList {
@@ -141 +152 @@
                 CList(CPair* c); 
                 ~CList(); 
-        void    insert(CPair* c); 
+        void    insert(CPair* c);
+        CNode*  getMinDeg();
+
+};
+
+
+/*
+======================================
+class RNode (nodes for lists of Rules)
+======================================
+*/
+class RNode {
+    private:
+        Rule*   data;
+        RNode*  next;
+    public:
+                RNode(Rule* r);
+                ~RNode();
+        RNode*  insert(Rule* r);
+};
+
+/*
+============================
+class RList (lists of Rules)
+============================
+*/
+class RList {
+    private:
+        RNode*  first;
+    public:
+                RList(Rule* r);
+                ~RList();
+        void    insert(Rule* r);
 };
 #endif