Changeset 8fc1b4d in git

Timestamp:

Oct 11, 2006, 5:57:00 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

39132394cccb0abb04cb64b0a4c7c37ca8c84ed8

Parents:

94a5cd44d6fd0c7c2a974433347946e67ec5ceea

Message:

*hannes: avoid static objects


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

File:

• kernel/mpr_complex.cc (modified) (9 diffs)

kernel/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.3 2005-07-27 15:48:29 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.4 2006-10-11 15:57:00 Singular Exp $ */
 
 /*
@@ -40 +40 @@
 extern int mmInit(void);
 int dummy=mmInit();
-static gmp_float gmpRel(0.0);
-static gmp_float diff(0.0);
+static gmp_float *gmpRel=NULL;
+static gmp_float *diff=NULL;
 
 
@@ -63 +63 @@
   gmp_output_digits= digits;
   mpf_set_default_prec( db );
-  mpf_set_prec(*diff._mpfp(),32);
-  mpf_set_prec(*gmpRel._mpfp(),32);
-  mpf_set_d(*gmpRel._mpfp(),0.1);
-  mpf_pow_ui(*gmpRel._mpfp(),*gmpRel._mpfp(),digits);
+  if (diff!=NULL) delete diff;
+  diff=new gmp_float(0.0);
+  mpf_set_prec(*diff->_mpfp(),32);
+  if (gmpRel!=NULL) delete gmpRel;
+  gmpRel=new gmp_float(0.0);
+  mpf_set_prec(*gmpRel->_mpfp(),32);
+  mpf_set_d(*gmpRel->_mpfp(),0.1);
+  mpf_pow_ui(*gmpRel->_mpfp(),*gmpRel->_mpfp(),digits);
 }
 
@@ -135 +139 @@
   }
   mpf_add( t, t, a.t );
-  mpf_set(diff.t, t);
-  mpf_set_prec(diff.t, 32);
-  mpf_div(diff.t, diff.t, a.t);
-  mpf_abs(diff.t, diff.t);
-  if(mpf_cmp(diff.t, gmpRel.t) < 0)
+  mpf_set(diff->t, t);
+  mpf_set_prec(diff->t, 32);
+  mpf_div(diff->t, diff->t, a.t);
+  mpf_abs(diff->t, diff->t);
+  if(mpf_cmp(diff->t, gmpRel->t) < 0)
     mpf_set_d( t, 0.0);
   return *this;
@@ -156 +160 @@
   }
   mpf_sub( t, t, a.t );
-  mpf_set(diff.t, t);
-  mpf_set_prec(diff.t, 32);
-  mpf_div(diff.t, diff.t, a.t);
-  mpf_abs(diff.t, diff.t);
-  if(mpf_cmp(diff.t, gmpRel.t) < 0)
+  mpf_set(diff->t, t);
+  mpf_set_prec(diff->t, 32);
+  mpf_div(diff->t, diff->t, a.t);
+  mpf_abs(diff->t, diff->t);
+  if(mpf_cmp(diff->t, gmpRel->t) < 0)
     mpf_set_d( t, 0.0);
   return *this;
@@ -172 +176 @@
   if((mpf_sgn(a.t)==0) && (mpf_sgn(b.t)==0))
     return true;
-  mpf_sub(diff.t, a.t, b.t);
-  mpf_div(diff.t, diff.t, a.t);
-  mpf_abs(diff.t, diff.t);
-  if(mpf_cmp(diff.t, gmpRel.t) < 0)
+  mpf_sub(diff->t, a.t, b.t);
+  mpf_div(diff->t, diff->t, a.t);
+  mpf_abs(diff->t, diff->t);
+  if(mpf_cmp(diff->t, gmpRel->t) < 0)
     return true;
   else
@@ -193 +197 @@
   if (mpf_sgn(t) <= 0)
     return false;
-  mpf_sub_ui(diff.t, t, 1);
-  mpf_abs(diff.t, diff.t);
-  if(mpf_cmp(diff.t, gmpRel.t) < 0)
+  mpf_sub_ui(diff->t, t, 1);
+  mpf_abs(diff->t, diff->t);
+  if(mpf_cmp(diff->t, gmpRel->t) < 0)
     return true;
   else
@@ -209 +213 @@
   if (mpf_sgn(t) >= 0)
     return false;
-  mpf_add_ui(diff.t, t, 1);
-  mpf_abs(diff.t, diff.t);
-  if(mpf_cmp(diff.t, gmpRel.t) < 0)
+  mpf_add_ui(diff->t, t, 1);
+  mpf_abs(diff->t, diff->t);
+  if(mpf_cmp(diff->t, gmpRel->t) < 0)
     return true;
   else
@@ -711 +715 @@
   {
     mpf_div(*ai._mpfp(), *ai._mpfp(), *ar._mpfp());
-    if (ai < gmpRel) this->imag(0.0);
+    if (ai < *gmpRel) this->imag(0.0);
   }
   else
   {
     mpf_div(*ar._mpfp(), *ar._mpfp(), *ai._mpfp());
-    if (ar < gmpRel) this->real(0.0);
+    if (ar < *gmpRel) this->real(0.0);
   }
 }