Changeset bad404 in git

Timestamp:

Jul 2, 1999, 6:43:19 PM (24 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

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

Children:

347cc4a89a0993c5c099335b71dd3a757e7d7805

Parents:

0e760d04e4076beb76ad1f4d178a2e3cf2b8c3d3

Message:

* wenk: changed ngcGreaterZero


git-svn-id: file:///usr/local/Singular/svn/trunk@3227 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• gnumpc.cc (modified) (2 diffs)
• mpr_complex.cc (modified) (3 diffs)

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.5 1999-07-02 16:14:38 wenk Exp $ */
+/* $Id: gnumpc.cc,v 1.6 1999-07-02 16:43:18 wenk Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -285 +285 @@
 
 /*2
-* za >= 0 ? ( real() > 0 || imag() > 0 )
+* za >= 0 ? 
 */
 BOOLEAN ngcGreaterZero (number a)
 {
   if ( a == NULL ) return TRUE;
-  return ( ((gmp_complex*)a)->real().sign() > 0 || ((gmp_complex*)a)->imag().sign() > 0 );
+  if ( ! ((gmp_complex*)a)->imag().isZero() ) 
+    return ( abs( *(gmp_complex*)a).sign() >= 0 );
+  else 
+    return ( ((gmp_complex*)a)->real().sign() >= 0 );
 }
 

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.11 1999-07-02 16:14:40 wenk Exp $ */
+/* $Id: mpr_complex.cc,v 1.12 1999-07-02 16:43:19 wenk Exp $ */
 
 /*
@@ -517 +517 @@
       memset(out,0,len);
       if (  !c.real().isZero() )  // (-23-i*5.43) or (15.1+i*5.3)
-        sprintf(out,"%s(%s%s%s*%s)",(c.imag().sign()<0&&c.real().sign()<0)?"+":"",
-                in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
-      else // +(-i*43) or +(i*34)
-        sprintf(out,"%s(%s%s*%s)",c.imag().sign()>=0?"":"+",
-                c.imag().sign()>=0?"":"-",currRing->parameter[0],in_imag);
+        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
+      else // (-i*43) or (i*34)
+        sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",currRing->parameter[0],in_imag);
     }
     else
@@ -528 +526 @@
       out=(char*)AllocL( len );
       memset(out,0,len);
-      if (  !c.real().isZero() ) 
-        sprintf(out,"%s(%s%s%s)",(c.imag().sign()<0&&c.real().sign()<0)?"+":"",
-                in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
+      if ( !c.real().isZero() ) 
+        sprintf(out,"(%s%s%s)",in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
       else
-        sprintf(out,"%s(%s%s)",c.imag().sign()>=0?"":"+",
-                c.imag().sign()>=0?"I*":"-I*",in_imag);
+        sprintf(out,"(%s%s)",c.imag().sign()>=0?"I*":"-I*",in_imag);
     }
     FreeL( (ADDRESS) in_real );