Changeset bfa04e in git

Timestamp:

Apr 29, 2011, 7:04:05 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

62604d2f2d4a187dd1464fdb07625f99d535f3b6

Parents:

aec5c92fa3e0f853348936026c999351aa972656

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-29 19:04:05+02:00

git-committer:

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

Message:

fix typos
minpoly is a poly in r->cf->algring

Location:

libpolys

Files:

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

libpolys/coeffs/gnumpc.cc

@@ -327 +327 @@
 {
   assume( getCoeffType(r) == ID );
-  assume( r->compex_parameter != NULL );
+  assume( r->complex_parameter != NULL );
+
   if ((*s >= '0') && (*s <= '9'))
   {
@@ -336 +337 @@
     delete re;
   }
-  else if (strncmp(s, r->compex_parameter,strlen(r->compex_parameter))==0)
-  {
-    s+=strlen(r->compex_parameter);
+  else if (strncmp(s, r->complex_parameter,strlen(r->complex_parameter))==0)
+  {
+    s+=strlen(r->complex_parameter);
     gmp_complex *aa=new gmp_complex((long)0,(long)1);
     *a=(number)aa;
@@ -487 +488 @@
 /// TODO: Any variables?
   if( p == NULL )
-    n->compex_parameter = "i"; //??
-  else
-    n->compex_parameter = omStrDup( (char*) p );
+    n->complex_parameter = "i"; //??
+  else
+    n->complex_parameter = omStrDup( (char*) p );
     
   return FALSE;

libpolys/coeffs/mpr_complex.cc

@@ -708 +708 @@
 char *complexToStr( gmp_complex & c, const unsigned int oprec, const coeffs src )
 {
-  assume( src->compex_parameter != NULL );
+  assume( src->complex_parameter != NULL );
   
   char *out,*in_imag,*in_real;
@@ -721 +721 @@
     if (nCoeff_is_long_C(src))
     {
-      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->compex_parameter))*sizeof(char);
+      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->complex_parameter))*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->compex_parameter,in_imag);
+        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",src->complex_parameter,in_imag);
       else // (-i*43) or (i*34)
       {
         if (c.imag().isOne())
-          sprintf(out,"%s",src->compex_parameter);
+          sprintf(out,"%s",src->complex_parameter);
         else if (c.imag().isMOne())
-          sprintf(out,"-%s",src->compex_parameter);
+          sprintf(out,"-%s",src->complex_parameter);
         else
-          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->compex_parameter,in_imag);
+          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->complex_parameter,in_imag);
       }
     }

libpolys/polys/monomials/ring.cc

@@ -1559 +1559 @@
   {
     if ( rMinpolyIsNULL(r2) ) return FALSE;
-    if (! n_Equal(r1->cf->algring->minideal->m[0],
-                  r2->cf->algring->minideal->m[0], r1->cf)) return FALSE;
+    if (! p_EqualPolys(r1->cf->algring->minideal->m[0],
+                  r2->cf->algring->minideal->m[0], 
+                  r1->cf->algring))
+      return FALSE;
   }
   else if (!rMinpolyIsNULL(r2)) return FALSE;