Changeset 3587 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Mar 5, 2009, 2:26:38 PM (17 years ago)

Author:

ansari

Message:

Adaptation suite nettoyage/suppression TRY/CATCH... , Reza 05/03/2009

Location:

trunk/SophyaLib/NTools

Files:

• dates.cc (modified) (6 diffs)
• generalfit.cc (modified) (4 diffs)
• integ.cc (modified) (5 diffs)

trunk/SophyaLib/NTools/dates.cc

@@ -112 +112 @@
   
   // Nous sommes dans un mois-frontiere
-  DBASSERT(dt.MM == dstStopMonth || dt.MM == dstStartMonth);
+  ASSERT(dt.MM == dstStopMonth || dt.MM == dstStartMonth);
   
   if (dt.MM == dstStartMonth) {
@@ -493 +493 @@
   
   if (tOpt == kLocalTime) {
-    DBASSERT(timeZone != NULL);
+    ASSERT(timeZone != NULL);
     operator -= (timeZone->gmtOffset/24.0);
     if (timeZone->IsDst(*this))
@@ -511 +511 @@
   Date dt(*this);
   if (tOpt == kLocalTime && !UndetTime()) {
-    DBASSERT(timeZone != NULL);
+    ASSERT(timeZone != NULL);
     dt += timeZone->GetOffset(*this)/24.0;
   }
@@ -535 +535 @@
   Date dt(*this);
   if (tOpt == kLocalTime && !UndetTime()) {
-    DBASSERT(timeZone != NULL);
+    ASSERT(timeZone != NULL);
     dt += timeZone->GetOffset(*this)/24.0;
   }
@@ -569 +569 @@
   Date dt(*this);
   if (tOpt == kLocalTime) {
-    DBASSERT(timeZone != NULL);
+    ASSERT(timeZone != NULL);
     dt += timeZone->GetOffset(*this)/24.0;
   }
@@ -628 +628 @@
   double t = GetDays();
   if (tOpt == kLocalTime && hh >=0) {
-    DBASSERT(timeZone != NULL);
+    ASSERT(timeZone != NULL);
     t += timeZone->GetOffset(*this)/24.0;
   }

trunk/SophyaLib/NTools/generalfit.cc

@@ -161 +161 @@
  ASSERT(mNPar<1000000);
 
- TRY {
-   General_Init();
- } CATCHALL {
-   THROW_SAME;
- } ENDTRY
-
+ General_Init();
 }
 
@@ -202 +197 @@
  ASSERT( mNPar < 1000000 );
 
- TRY {
-   General_Init();
- } CATCHALL {
-   THROW_SAME;
- } ENDTRY
-
+ General_Init();
 }
 
@@ -242 +232 @@
  GetIntEnv("PDEBUG_GENERALFIT",debugLevel);
 
- TRY {
+ try {
    fixParam   = new unsigned short int[mNPar];
    boundParam = new unsigned short int[mNPar];
    nameParam  = new string[mNPar];
- } CATCHALL {
+ }  
+ catch (...) {
    cout<<"GeneralFit::GeneralFit Impossible d'allouer l'espace"<<endl;
-   THROW_SAME;
- } ENDTRY
+   throw AllocationError("GeneralFit::GeneralFit() error allocating with new ...");
+} 
 
  Param        = (double)  0.;
@@ -910 +901 @@
 
    // Calcul de la matrice des covariances
-#ifdef __mac__
-   COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
-#else
-   TRY {
+   try {
      COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
-   } CATCHALL {
+   } 
+   catch (MathExc& exc) {
      if(debugLevel>0) {
+       cout<<"GeneralFit::Fit()/Exception:" << exc.what() << endl; 
        cout<<"Pb inversion matrice ATGA:"<<endl;
        cout<<ATGA;
      }
      return(-10);
-   } ENDTRY
-#endif
+  }
 
    if (debugLevel >= 3) {

trunk/SophyaLib/NTools/integ.cc

@@ -80 +80 @@
   mXMin(xmin), mXMax(xmax)
 {
-  DBASSERT(gff->NVar() == 1);
+  ASSERT(gff->NVar() == 1);
 }
 
@@ -94 +94 @@
   mXMin(0), mXMax(1)
 {
-  DBASSERT(gff->NVar() == 1);
+  ASSERT(gff->NVar() == 1);
 }
 
@@ -140 +140 @@
 Integrator::ReqPrec(double p)
 {
-  DBASSERT( !"Pas encore implemente !");
+  ASSERT( !"Pas encore implemente !");
   mReqPrec = p;
   mDX = mNStep = -1;
@@ -191 +191 @@
   mGFFParm = par;
   mFunc = NULL;
-  DBASSERT(gff->NVar() == 1);
+  ASSERT(gff->NVar() == 1);
   FuncChanged();
   return *this;
@@ -199 +199 @@
 Integrator::FVal(double x) const
 {
-  DBASSERT( mFunc || mClFun || (mGFF && mGFFParm) );
+  ASSERT( mFunc || mClFun || (mGFF && mGFFParm) );
   if (mFunc) return mFunc(x);
   else return mClFun ? (*mClFun)(x) : mGFF->Value(&x, mGFFParm);