Changeset 9af8d18 in git

Timestamp:

Jul 19, 2011, 2:55:33 PM (12 years ago)

Author:

mlee <martinlee84@…>

Branches:

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

Children:

660a68fc35c514edd7c0ed668a72a1375b26af96

Parents:

e6e2198ed93af775c39a664d74d4d9deadd803ab

git-author:

mlee <martinlee84@web.de>2011-07-19 14:55:33+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:40:43+01:00

Message:

added a member ring to class spectrumPolyNode
added const ring to ring dependend functions

Location:

kernel

Files:

• splist.cc (modified) (13 diffs)
• splist.h (modified) (2 diffs)

kernel/splist.cc

@@ -22 +22 @@
 #include <kernel/GMPrat.h>
 #include <coeffs/numbers.h>
-#include <polys/polys.h>
+#include <polys/monomials/p_polys.h>
 #include <kernel/npolygon.h>
 #include <kernel/splist.h>
@@ -41 +41 @@
     weight = (Rational)0;
     nf     = NULL;
+    r      = NULL;
 }
 
@@ -48 +49 @@
 
 void    spectrumPolyNode::copy_shallow(
-                spectrumPolyNode *pnode,poly m,const Rational &w,poly f )
+         spectrumPolyNode *pnode,poly m,const Rational &w,poly f, const ring R )
 {
     next   = pnode;
@@ -54 +55 @@
     weight = w;
     nf     = f;
+    r      = R;
 }
 
@@ -66 +68 @@
     weight = node.weight;
     nf     = node.nf;
+    r      = node.r;
 }
 
@@ -82 +85 @@
 
 spectrumPolyNode::spectrumPolyNode(
-        spectrumPolyNode *pnode,poly m,const Rational &w,poly f )
-{
-    copy_shallow( pnode,m,w,f );
+        spectrumPolyNode *pnode,poly m,const Rational &w,poly f, const ring R )
+{
+    copy_shallow( pnode,m,w,f,R );
 }
 
@@ -91 +94 @@
 // ----------------------------------------------------------------------------
 
-spectrumPolyNode::~spectrumPolyNode( )
-{
-    if( mon!=NULL ) pDelete( &mon );
-    if( nf !=NULL ) pDelete( &nf );
+spectrumPolyNode::~spectrumPolyNode()
+{
+    if( mon!=NULL ) p_Delete( &mon, r );
+    if( nf !=NULL ) p_Delete( &nf,r );
     copy_zero( );
 }
@@ -176 +179 @@
 // ----------------------------------------------------------------------------
 
-void    spectrumPolyList::insert_node( poly m,poly f )
+void    spectrumPolyList::insert_node( poly m,poly f, const ring R )
 {
     #ifdef SPLIST_DEBUG
@@ -198 +201 @@
 
     spectrumPolyNode    *newnode = new spectrumPolyNode(
-        (spectrumPolyNode*)NULL,m,np->weight_shift( m ),f );
+        (spectrumPolyNode*)NULL,m,np->weight_shift( m,R ),f, R );
 
     if( N==0 ||
               root->weight>newnode->weight ||
             ( root->weight==newnode->weight &&
-              pCmp( root->mon,newnode->mon )<0 ) )
+              p_Cmp( root->mon,newnode->mon,R )<0 ) )
     {
         // ----------------------
@@ -232 +235 @@
                ( newnode->weight>next->weight ||
                ( newnode->weight==next->weight &&
-                 pCmp( newnode->mon,next->mon )<0 ) ) )
+                 p_Cmp( newnode->mon,next->mon, R )<0 ) ) )
         {
             actual = next;
@@ -261 +264 @@
 // ----------------------------------------------------------------------------
 
-void    spectrumPolyList::delete_monomial( poly m )
+void    spectrumPolyList::delete_monomial( poly m, const ring R )
 {
     spectrumPolyNode **node = &root;
     poly              *f;
 
-    m = pCopy( m );
+    m = p_Copy( m,R );
 
     while( *node!=(spectrumPolyNode*)NULL )
     {
-        if( pCmp( m,(*node)->mon )>=0 && pLmDivisibleByNoComp( m,(*node)->mon ) )
+        if( p_Cmp( m,(*node)->mon,R )>=0 && p_LmDivisibleByNoComp( m,(*node)->mon, R ))
         {
             delete_node( node );
@@ -280 +283 @@
             while( *f!=NULL )
             {
-                if( pCmp( m,*f )>=0 && pLmDivisibleByNoComp( m,*f ) )
+                if( p_Cmp( m,*f,R )>=0 && p_LmDivisibleByNoComp( m,*f,R ) )
                 {
-                    pLmDelete(f);
+                    p_LmDelete(f,R);
                 }
                 else
@@ -304 +307 @@
         }
     }
-    pDelete( &m );
+    p_Delete( &m,R );
 }
 

kernel/splist.h

@@ -41 +41 @@
     Rational            weight;
     poly                nf;
+    ring                r;
 
     spectrumPolyNode( );
-    spectrumPolyNode( spectrumPolyNode*,poly,const Rational&,poly );
+    spectrumPolyNode( spectrumPolyNode*,poly,const Rational&,poly, const ring);
     ~spectrumPolyNode( );
 
     void    copy_zero   ( void );
-    void    copy_shallow( spectrumPolyNode*,poly,const Rational&,poly );
+    void    copy_shallow( spectrumPolyNode*,poly,const Rational&,poly, const ring);
     void    copy_shallow( spectrumPolyNode& );
 };
@@ -69 +70 @@
     void    copy_shallow( spectrumPolyList& );
 
-    void    insert_node( poly,poly );
+    void    insert_node( poly,poly, const ring );
     void    delete_node( spectrumPolyNode** );
 
-    void    delete_monomial( poly );
+    void    delete_monomial( poly, const ring );
 
     spectrumState  spectrum( lists*,int );