Changeset b0bb93f in git

Timestamp:

Dec 14, 2011, 3:21:12 PM (12 years ago)

Author:

YueRen <yue.ren.kl@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

eb71ba41d7467fc241fc87e95ae3e044933adafd

Parents:

62b20a676b4c20cfdee48773925c850d105aba6e

git-author:

YueRen <yue.ren.kl@gmail.com>2011-12-14 15:21:12+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00

Message:

extended nfCoeffsEqual to check for parameter names

Location:

libpolys/coeffs

Files:

• ffields.cc (modified) (2 diffs)
• ffields.h (modified) (2 diffs)

libpolys/coeffs/ffields.cc

@@ -756 +756 @@
 }
 
+static BOOLEAN nfCoeffIsEqual(const coeffs, n_coeffType, void*);
+
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
-
-
   //r->cfInitChar=npInitChar;
   //r->cfKillChar=nfKillChar;
@@ -882 +882 @@
 }
 
-BOOLEAN nfCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter)
-{
-
+static BOOLEAN nfCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter)
+{
   if (n==n_GF) {
     GFInfo* p = (GFInfo *)(parameter);
     int c = pow (p->GFChar, p->GFDegree);
-    if (c == r->m_nfCharQ)
+    if ((c == r->m_nfCharQ) && (strcmp(r->m_nfParameter,p->GFPar_name) == 0))
       return TRUE;
   }

libpolys/coeffs/ffields.h

@@ -11 +11 @@
 
 BOOLEAN nfInitChar(coeffs r, void*);
-
-//static BOOLEAN nfCoeffsEqual(const coeffs r, n_coeffType n, void* parameter);
 
 BOOLEAN nfGreaterZero (number k, const coeffs r);
@@ -45 +43 @@
 void    nfShowMipo(const coeffs r);
 #endif
-
-BOOLEAN nfCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter);