Changeset 47ab5b in git for libpolys

Timestamp:

Feb 8, 2012, 6:48:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e5fc00c615e47e7757b8c95660e3a8ac06ffdef0

Parents:

237b4dda7a8a6ccfcc5966b92c779cebeebc30cc

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-08 18:48:08+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-08 22:31:58+01:00

Message:

fixing real (GMP) complex numbers (n_long_C)

fix: this domain also have a parameter!
fix: ngcCoeffIsEqual didn't compare parameter name

TODO (general): move Decompose & Compose, rParameter & rPar into coeffs

Location:

libpolys

Files:

• coeffs/gnumpc.cc (modified) (1 diff)
• polys/monomials/ring.cc (modified) (1 diff)
• polys/monomials/ring.h (modified) (2 diffs)

libpolys/coeffs/gnumpc.cc

@@ -377 +377 @@
 BOOLEAN ngcCoeffIsEqual (const coeffs r, n_coeffType n, void * parameter)
 {
-  if (n==ID) {
+  if (n==ID)
+  {
     LongComplexInfo* p = (LongComplexInfo *)(parameter);
-    if (p->float_len == r->float_len && p->float_len2 == r->float_len2 &&
-                    strcmp(p->par_name, r->complex_parameter))
-      return TRUE;
-  }
-  return FALSE;
+    
+    if (
+        (p->float_len == r->float_len) &&
+        (p->float_len2 == r->float_len2)
+       )
+      if (strcmp(p->par_name, r->complex_parameter) == 0)
+        return (TRUE);
+  }
+  return (FALSE);
 }
 

libpolys/polys/monomials/ring.cc

@@ -581 +581 @@
 }
 
+/// TODO: make it a virtual method of coeffs, together with:
+/// Decompose & Compose, rParameter & rPar
 char * rCharStr(ring r)
 {

libpolys/polys/monomials/ring.h

@@ -526 +526 @@
     return rVar( R );
   }
+  else if (nCoeff_is_long_C(C))
+  {
+    return 1;
+  }
   return 0;
 }
@@ -546 +550 @@
   {
     return &(C->m_nfParameter);
+  }
+  else if (nCoeff_is_long_C(C))
+  {
+    return &(C->complex_parameter);
   }
   return NULL;