Changeset c41fbf in git

Timestamp:

May 17, 2010, 7:19:45 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

78e67ebed527a6a6c46377271737846d0daadcbd

Parents:

4f3b79efc8dad5c9a3fd5fda10687e411d13eb1a

Message:

comparing complex numbers: ignore the imag. part

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

Location:

kernel

Files:

• gnumpc.cc (modified) (1 diff)
• mpr_complex.h (modified) (2 diffs)

kernel/gnumpc.cc

@@ -382 +382 @@
     return (((gmp_complex*)b)->real().sign() < 0);
   }
-  if ( b==NULL )
+  else if ( b==NULL )
   {
     return (((gmp_complex*)a)->real().sign() < 0);
+  }
+  else
+  {
+    return ((gmp_complex*)a) > ((gmp_complex*)b);
   }
   return FALSE;

kernel/mpr_complex.h

@@ -215 +215 @@
 
   inline friend bool operator == ( const gmp_complex & a, const gmp_complex & b );
+  inline friend bool operator  > ( const gmp_complex & a, const gmp_complex & b );
+  inline friend bool operator  < ( const gmp_complex & a, const gmp_complex & b );
+  inline friend bool operator >= ( const gmp_complex & a, const gmp_complex & b );
+  inline friend bool operator <= ( const gmp_complex & a, const gmp_complex & b );
 
   inline gmp_complex & operator = ( const gmp_complex & a );
@@ -255 +259 @@
   return ( b.real() == a.real() ) && ( b.imag() == a.imag() );
 }
+inline bool operator  > ( const gmp_complex & a, const gmp_complex & b )
+{
+  return ( a.real() > b.real() );
+}
+inline bool operator  < ( const gmp_complex & a, const gmp_complex & b )
+{
+  return ( a.real() < b.real() );
+}
+inline bool operator >= ( const gmp_complex & a, const gmp_complex & b )
+{
+  return ( a.real() >= b.real() );
+}
+inline bool operator <= ( const gmp_complex & a, const gmp_complex & b )
+{
+  return ( a.real() <= b.real() );
+}
+
 
 // <gmp_complex> = <gmp_complex>