Changeset 7fee876 in git for libpolys/coeffs/mpr_complex.cc

Timestamp:

Mar 16, 2012, 9:26:19 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5a72fe43aa1fbae0fb93ebbff5685375e726f93c

Parents:

ce1f78b09d525de2d3babcf986a9f4821e60ed00

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 21:26:19+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-17 05:41:42+01:00

Message:

moved prarameter-handling to coeffs from rings.* and related fixes

chg: removed complex_parameter, m_nfParameter
add: n_NumberOfParameters, n_ParameterNames, n_Param(coeffs)
fix: par(1) (n_Param) for n_GF & n_long_C
fix/chg: n_long_C is an Extension as well (rIsExtension)
fix: n_long_C ngcCoeffWrite: additional space needed for compatibility with legacy Singular
fix: complexToStr over non-C coeffs!
fix: rRenameVars renames _new_ VARIABLES instead of _old_ parameters!
fix: coeff construction was broken in walk.cc
add/fix: nfKillChar, ngcKillChar
chg: cleanup of headers & tests
chg: parameter output during "make check"

File:

• libpolys/coeffs/mpr_complex.cc (modified) (2 diffs)

libpolys/coeffs/mpr_complex.cc

@@ -708 +708 @@
 char *complexToStr( gmp_complex & c, const unsigned int oprec, const coeffs src )
 {
-  assume( src->complex_parameter != NULL );
+  const char * complex_parameter = "I";
+  int N = 1; // strlen(complex_parameter);
+   
+  if (nCoeff_is_long_C(src))
+  {
+    complex_parameter = n_ParameterNames(src)[0];
+    N = strlen(complex_parameter);
+  }
+
+  assume( complex_parameter != NULL && N > 0);
   
   char *out,*in_imag,*in_real;
@@ -721 +730 @@
     if (nCoeff_is_long_C(src))
     {
-      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->complex_parameter))*sizeof(char);
+      int len=(strlen(in_real)+strlen(in_imag)+7+N)*sizeof(char);
       out=(char*)omAlloc(len);
       memset(out,0,len);
       if (  !c.real().isZero() )  // (-23-i*5.43) or (15.1+i*5.3)
-        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",src->complex_parameter,in_imag);
+        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",complex_parameter,in_imag);
       else // (-i*43) or (i*34)
       {
         if (c.imag().isOne())
-          sprintf(out,"%s",src->complex_parameter);
+          sprintf(out,"%s", complex_parameter);
         else if (c.imag().isMOne())
-          sprintf(out,"-%s",src->complex_parameter);
+          sprintf(out,"-%s", complex_parameter);
         else
-          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->complex_parameter,in_imag);
+          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-", complex_parameter,in_imag);
       }
     }