Changeset 1868 in Sophya for trunk/Eval/COS/vecmapstl.cc

Timestamp:

Jan 18, 2002, 11:41:58 AM (24 years ago)

Author:

ansari

Message:

suite test sur classe complex ds vecmapstl.cc - Reza 18/01/2002

File:

• trunk/Eval/COS/vecmapstl.cc (modified) (2 diffs)

trunk/Eval/COS/vecmapstl.cc

@@ -22 +22 @@
 public:
   inline convCR() { dv = 0.;  dv_im = 0.; }  
+  inline convCR(convCR const& x) { dv = x.dv;  dv_im = x.dv_im; }  
   inline convCR(float v) { dv = (double)v;  dv_im = 0.; }  
   inline convCR(double v) { dv = v;  dv_im = 0.; }  
   inline convCR(complex<float> const & z) { dv = (double)z.real();  dv_im = (double)z.imag(); }  
   inline convCR(complex<double> const & z) { dv = z.real();  dv_im = z.imag(); }
-  inline float  operator= (float v) { dv = (double)v;  dv_im = 0.; return v; }
-  inline double operator= (double v) { dv = v;  dv_im = 0.; return v; }
-  inline complex<float>  operator= (complex<float> const & z) 
-   { dv = (double)z.real(); dv_im = (double)z.imag(); return z; }
-  inline complex<double>  operator= (complex<double> const & z) 
-   { dv = z.real(); dv_im = z.imag(); return z; }
+  inline convCR&  operator= (float v) { dv = (double)v;  dv_im = 0.; return (*this); }
+  inline convCR&  operator= (double v) { dv = v;  dv_im = 0.; return (*this); }
+  inline convCR&  operator= (complex<float> const & z) 
+   { dv = (double)z.real(); dv_im = (double)z.imag(); return (*this); }
+  inline  convCR& operator= (complex<double> const & z) 
+   { dv = z.real(); dv_im = z.imag(); return (*this); }
 
   inline operator float() const  { return((float)dv); }
@@ -81 +82 @@
     << " zb+zc=" << zb+zc << endl ; 
 #else
-    cout << " convCR: czr1(z1)" << (complex<float>)czr1
-         << " czr2(z2)" << (complex<double>)czr2 
-         << " czr1+czr2= " << (complex<double>)czr2+(complex<double>)czr1 << endl;
+    cout << " convCR: czr1(z1)" << (complex<float>)(czr1)
+         << " czr2(z2)" << (complex<double>)(czr2) << endl; 
+         << " czr1+czr2= " << (complex<double>)czr2+(complex<double>)czr1 << endl;
 #endif
   }