Changeset 47ab5b in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

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

Files:

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

Singular/ipshell.cc

@@ -1695 +1695 @@
   {
     L->m[2].rtyp=STRING_CMD;
-    L->m[2].data=(void *)omStrDup(rParameter(R)[0]);
+    L->m[2].data=(void *)omStrDup(*rParameter(R));
   }
   // ----------------------------------------
@@ -1756 +1756 @@
   // ----------------------------------------
   // 0: char/ cf - ring
-  #if 1 /* TODO */
   if (rField_is_numeric(r))
   {
@@ -1775 +1774 @@
       
       rDecomposeCF(&(L->m[0]), r->cf->extRing, r);
-    }else
+    }
+    else
     {
       assume( nCoeff_is_GF(r->cf) );
@@ -1788 +1788 @@
       Lv->Init(1);
       Lv->m[0].rtyp=STRING_CMD;
-      Lv->m[0].data=(void *)omStrDup(rParameter(r)[0]);     
+      Lv->m[0].data=(void *)omStrDup(*rParameter(r));     
       Lc->m[1].rtyp=LIST_CMD;
       Lc->m[1].data=(void*)Lv;
@@ -1822 +1822 @@
   }
   else
-  #endif
   {
     L->m[0].rtyp=INT_CMD;
@@ -1904 +1903 @@
     L->m[3].data=(void *)idCopy(r->qideal);
   // ----------------------------------------
-  #ifdef HAVE_PLURAL // NC! in rDecompose
+#ifdef HAVE_PLURAL // NC! in rDecompose
   if (rIsPluralRing(r))
   {
@@ -1912 +1911 @@
     L->m[5].data=(void *)mp_Copy(r->GetNC()->D, r, r);
   }
-  #endif
+#endif
   return L;
 }
@@ -1926 +1925 @@
     return;
   }
-  R->cf->ch=-1;
+//  R->cf->ch=0;
   // ----------------------------------------
   // 1:
@@ -5062 +5061 @@
        
        // set the parameter name
-       if (complex_flag) {
-          if (pn->next == NULL)
-            param.par_name=(const char*)"i"; //default to i
-          else
-            param.par_name = (const char*)pn->next->name;
+       if (complex_flag)
+       {
+         if (pn->next == NULL)
+           param.par_name=(const char*)"i"; //default to i
+         else
+           param.par_name = (const char*)pn->next->name;
        }
 

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;