Changeset 2506 in Sophya for trunk/SophyaLib/NTools/poly.cc

Timestamp:

Mar 15, 2004, 5:46:56 PM (22 years ago)

Author:

ansari

Message:

Remplacement THROW par throw - Reza 15/03/2004

File:

• trunk/SophyaLib/NTools/poly.cc (modified) (16 diffs)

trunk/SophyaLib/NTools/poly.cc

@@ -20 +20 @@
 : TVector<r_8>(degre+1), dirty(0), deg(0)
 {
-  END_CONSTRUCTOR
 }
 
@@ -27 +26 @@
 :TVector<r_8>(a), dirty(a.dirty), deg(a.deg)
 {
-  END_CONSTRUCTOR
 }
 
@@ -96 +94 @@
       return Root2(roots(0),roots(1));
     default :
-      THROW(parmErr);
+      throw ParmError("Poly::Roots()") ;
     }
 }
@@ -106 +104 @@
 {
   UpdateDegIfDirty();
-  if (deg != 1) THROW(sizeMismatchErr);
+  if (deg != 1) ParmError("Poly::Root1() deg!= 1") ;
 
   if (Element(1) == 0) return 0;
@@ -118 +116 @@
 {
   UpdateDegIfDirty();
-  if (deg != 2) THROW(sizeMismatchErr);
+  if (deg != 2) throw SzMismatchError("Poly::Root2() deg != 2") ;
 
   double delta = Element(1)*Element(1) - 4*Element(0)*Element(2);
@@ -227 +225 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly::Fit() ");
 
   Realloc(degre);
@@ -262 +260 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)erry2.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly::Fit() ");
+  if (n != (int)erry2.NElts()) throw SzMismatchError("Poly::Fit() ") ;
 
   Realloc(degre);
@@ -288 +286 @@
 Poly Poly::power(int n) const // a accelerer !!!
 {
-  if (n < 0) THROW(rangeCheckErr);
+  if (n < 0) throw RangeCheckError("Poly::power() n<0 ");
   if (n == 0) { Poly r(0); r[0] = 1; return r;}
   if (n == 1) { return *this; }
@@ -358 +356 @@
  maxDegX(degreX), maxDegY(degreY), degX(0), degY(0), deg(0)
 {
-  END_CONSTRUCTOR
 }
 
@@ -370 +367 @@
     for (int j=0; j<=degY; j++)
       Coef(i,j) = polX[i]*polY[j];
-  END_CONSTRUCTOR
 }
 
@@ -379 +375 @@
  degX(a.degX), degY(a.degY), deg(a.deg)
 {
-  END_CONSTRUCTOR
 }
 
@@ -467 +462 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)z.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly2::Fit() - 1");
+  if (n != (int)z.NElts()) throw SzMismatchError("Poly2::Fit() - 2");
 
   Realloc(degreX, degreY);
@@ -510 +505 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)z.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)errz2.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly2::Fit() - 3");
+  if (n != (int)z.NElts()) throw SzMismatchError("Poly2::Fit() - 4");
+  if (n != (int)errz2.NElts()) throw SzMismatchError("Poly2::Fit() - 5");
 
   Realloc(degreX, degreY);
@@ -551 +546 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)z.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly2::Fit() - 6");
+  if (n != (int)z.NElts()) throw SzMismatchError("Poly2::Fit() - 7");
 
   Realloc(degre, degre);   // certains vaudront 0, impose.
@@ -604 +599 @@
 {
   int n = x.NElts();
-  if (n != (int)y.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)z.NElts()) THROW(sizeMismatchErr);
-  if (n != (int)errz2.NElts()) THROW(sizeMismatchErr);
+  if (n != (int)y.NElts()) throw SzMismatchError("Poly2::Fit() - 8");
+  if (n != (int)z.NElts()) throw SzMismatchError("Poly2::Fit() - 9");
+  if (n != (int)errz2.NElts()) throw SzMismatchError("Poly2::Fit() - 10");
 
   Realloc(degre, degre);
@@ -733 +728 @@
 Poly2 Poly2::power(int n) const
 {
-  if (n < 0) THROW(rangeCheckErr);
+  if (n < 0) throw RangeCheckError("Poly2::power(n<0) ");
   if (n == 0) { Poly2 r(0); r.Coef(0,0) = 1; return r;}
   if (n == 1) { return *this; }