Changeset 78e67e in git

Timestamp:

May 19, 2010, 3:29:07 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

890d63bbbc7613a022667f9ddf89a967cc6f29b6

Parents:

c41fbf0bdd4de6c2af503202f51e4838b376d632

Message:

number is usually not NULL in this case

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

File:

• kernel/gnumpc.cc (modified) (19 diffs)

kernel/gnumpc.cc

@@ -108 +108 @@
 number ngcInit (int i, const ring r)
 {
-  gmp_complex* n= NULL;
-  if ( i != 0 )
-  {
-    n= new gmp_complex( (long)i, (long)0 );
-  }
+  gmp_complex* n= new gmp_complex( (long)i, (long)0 );
   return (number)n;
 }
@@ -121 +117 @@
 int ngcInt(number &i, const ring r)
 {
-  if ( i == NULL ) return 0;
   return (int)((gmp_complex*)i)->real();
 }
@@ -142 +137 @@
 number ngcCopy(number a)
 {
-  gmp_complex* b= NULL;
-  if ( a !=  NULL )
-  {
-    b= new gmp_complex( *(gmp_complex*)a );
-  }
+  gmp_complex* b= new gmp_complex( *(gmp_complex*)a );
   return (number)b;
 }
 number ngc_Copy(number a, ring r)
 {
-  gmp_complex* b= NULL;
-  if ( a !=  NULL )
-  {
-    b= new gmp_complex( *(gmp_complex*)a );
-  }
+  gmp_complex* b=new gmp_complex( *(gmp_complex*)a );
   return (number)b;
 }
@@ -166 +153 @@
 number ngcNeg (number a)
 {
-  if ( a == NULL ) return NULL;
   gmp_complex* r=(gmp_complex*)a;
   (*r) *= ngc_m1;
@@ -178 +164 @@
 {
   gmp_complex* r = NULL;
-  if ( (a==NULL)
-  || (((gmp_complex*)a)->isZero()))
+  if (((gmp_complex*)a)->isZero())
   {
     WerrorS(nDivBy0);
@@ -195 +180 @@
 number ngcAdd (number a, number b)
 {
-  gmp_complex* r= NULL;
-  if ( a==NULL && b==NULL )
-  {
-    return NULL;
-  }
-  else if ( a == NULL )
-  {
-    r= new gmp_complex( *(gmp_complex*)b );
-  }
-  else if ( b == NULL )
-  {
-    r= new gmp_complex( *(gmp_complex*)a );
-  }
-  else
-  {
-    r= new gmp_complex( (*(gmp_complex*)a) + (*(gmp_complex*)b) );
-  }
+  gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) + (*(gmp_complex*)b) );
   return (number)r;
 }
@@ -220 +189 @@
 number ngcSub (number a, number b)
 {
-  gmp_complex* r= NULL;
-  if ( a==NULL && b==NULL )
-  {
-    return NULL;
-  }
-  else if ( a == NULL )
-  {
-    r= new gmp_complex( (*(gmp_complex*)b) );
-    r= (gmp_complex *)ngcNeg((number)r);
-  }
-  else if ( b == NULL )
-  {
-    r= new gmp_complex( *(gmp_complex*)a );
-  }
-  else
-  {
-    r= new gmp_complex( (*(gmp_complex*)a) - (*(gmp_complex*)b) );
-  }
+  gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) - (*(gmp_complex*)b) );
   return (number)r;
 }
@@ -246 +198 @@
 number ngcMult (number a, number b)
 {
-  gmp_complex* r= NULL;
-  if ( a==NULL || b==NULL )
-  {
-    return NULL;
-  }
-  else
-  {
-    r= new gmp_complex( (*(gmp_complex*)a) * (*(gmp_complex*)b) );
-  }
+  gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) * (*(gmp_complex*)b) );
   return (number)r;
 }
@@ -263 +207 @@
 number ngcDiv (number a, number b)
 {
-  if ( a==NULL )
-  {
-    // 0/b = 0
-    return NULL;
-  }
-  else if (( b==NULL )
-  || (((gmp_complex*)b)->isZero()))
+  if (((gmp_complex*)b)->isZero())
   {
     // a/0 = error
@@ -293 +231 @@
   {
     nNew(u);
-    if ( x == NULL )
-    {
-      gmp_complex* n = new gmp_complex();
-      *u=(number)n;
-    }
-    else
-    {
-      gmp_complex* n = new gmp_complex();
-      *n= *(gmp_complex*)x;
-      *u=(number)n;
-    }
+    gmp_complex* n = new gmp_complex();
+    *n= *(gmp_complex*)x;
+    *u=(number)n;
     return;
   }
@@ -309 +239 @@
   {
     nNew(u);
-    if ( x == NULL )
-    {
-      gmp_complex* n = new gmp_complex();
-      *u=(number)n;
-    }
-    else
-    {
-      gmp_complex* n = new gmp_complex();
-      *n= *(gmp_complex*)x;
-      *u=(number)n;
-      *(gmp_complex*)(*u) *= *(gmp_complex*)n;
-    }
+    gmp_complex* n = new gmp_complex();
+    *n= *(gmp_complex*)x;
+    *u=(number)n;
+    *(gmp_complex*)(*u) *= *(gmp_complex*)n;
     return;
   }
@@ -343 +265 @@
 BOOLEAN ngcIsZero (number a)
 {
-  if ( a == NULL ) return TRUE;
   return ( ((gmp_complex*)a)->real().isZero() && ((gmp_complex*)a)->imag().isZero());
 }
@@ -349 +270 @@
 number ngcRePart(number a)
 {
-  if ((a==NULL) || ((gmp_complex*)a)->real().isZero()) return NULL;
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->real());
   return (number)n;
@@ -356 +276 @@
 number ngcImPart(number a)
 {
-  if ((a==NULL) || ((gmp_complex*)a)->imag().isZero()) return NULL;
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->imag());
   return (number)n;
@@ -366 +285 @@
 BOOLEAN ngcGreaterZero (number a)
 {
-  if ( a == NULL ) return TRUE;
   if ( ! ((gmp_complex*)a)->imag().isZero() )
     return ( abs( *(gmp_complex*)a).sign() >= 0 );
@@ -378 +296 @@
 BOOLEAN ngcGreater (number a, number b)
 {
-  if ( a==NULL )
-  {
-    return (((gmp_complex*)b)->real().sign() < 0);
-  }
-  else if ( b==NULL )
-  {
-    return (((gmp_complex*)a)->real().sign() < 0);
-  }
-  else
-  {
-    return ((gmp_complex*)a) > ((gmp_complex*)b);
-  }
-  return FALSE;
+  return ((gmp_complex*)a) > ((gmp_complex*)b);
 }
 
@@ -398 +304 @@
 BOOLEAN ngcEqual (number a, number b)
 {
-  if ( a == NULL && b == NULL )
-  {
-    return TRUE;
-  }
-  else if ( a == NULL || b == NULL )
-  {
-    return FALSE;
-  }
   return ( (*(gmp_complex*)a) == (*(gmp_complex*)b) );
 }
@@ -414 +312 @@
 BOOLEAN ngcIsOne (number a)
 {
-  if ( a == NULL ) return FALSE;
-  //return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
-  return (((gmp_complex*)a)->real().isOne());
+  return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
+  //return (((gmp_complex*)a)->real().isOne());
 }
 
@@ -424 +321 @@
 BOOLEAN ngcIsMOne (number a)
 {
-  if ( a == NULL ) return FALSE;
-  //  return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
-  return (((gmp_complex*)a)->real().isMOne());
+  return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
+  //return (((gmp_complex*)a)->real().isMOne());
 }