Changeset 2001 in Sophya for trunk

Timestamp:

May 14, 2002, 5:12:52 PM (23 years ago)

Author:

ansari

Message:

Correction/renforcement protection calculs doubles ds PIGraphicUC::SetUCS() - Reza 14/5/2002

File:

• trunk/SophyaPI/PI/pigraphuc.cc (modified) (2 diffs)

trunk/SophyaPI/PI/pigraphuc.cc

@@ -17 +17 @@
 //define PROT_DBLE  1.e-19
 #define PETIT_DBLE 1.e-100
-#define PREC_DBLE  1.e-16
+// qque probleme sur le trace - J'augmente les marges - Reza 14/5/2002 
+// #define PREC_DBLE  1.e-16  
+#define PREC_DBLE  1.e-14
 #define PROT_DBLE  1.e-40
 
@@ -177 +179 @@
 
   double xym;
-  xym = fabs(xmax+xmin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-  if ((xmax-xmin)/xym < PREC_DBLE) {xmin=xmin-PREC_DBLE/2.*xym; xmax=xmin+PREC_DBLE*xym;}
-  xym = fabs(ymax+ymin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
-  if ((ymax-ymin)/xym < PREC_DBLE) {ymin=ymin-PREC_DBLE/2.*xym; ymax=ymin+PREC_DBLE*xym;}
+  //DBG-REZA  cerr << " DBG-SetUCS() xmax-xmin = " << xmax-xmin << " xmin,max=" << xmin << "," << xmax << endl;
+  if ((xmax-xmin) < PREC_DBLE*fabs(xmax+xmin)) { 
+    xym = fabs(xmax);  xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+    xmax += PREC_DBLE/2.*xym;
+    xmin -= PREC_DBLE/2.*xym;
+    //DBG-REZA  cerr << " PIGraphicUC::SetUCS() xmin,max=" << xmin << "," << xmax << " xym=" << xym << endl;
+  }
+  //DBG-REZAcerr << " DBG-SetUCS() ymax-ymin = " << ymax-ymin << " ymin,max=" << ymin << "," << ymax << endl;
+  if ((ymax-ymin) < PREC_DBLE*fabs(ymax+ymin)) { 
+    xym = fabs(ymax);  xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+    ymax += PREC_DBLE/2.*xym;
+    ymin -= PREC_DBLE/2.*xym;
+    //DBG-REZAcerr << " PIGraphicUC::SetUCS() ymin,max=" << ymin << "," << ymax << " xym=" << xym << endl;
+  }
+  //    xym = fabs(xmax+xmin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  // if ((xmax-xmin)/xym < PREC_DBLE) {xmin=xmin-PREC_DBLE/2.*xym; xmax=xmin+PREC_DBLE*xym;}
+  // xym = fabs(ymax+ymin); xym = (xym > PETIT_DBLE) ? xym : PETIT_DBLE;
+  // if ((ymax-ymin)/xym < PREC_DBLE) {ymin=ymin-PREC_DBLE/2.*xym; ymax=ymin+PREC_DBLE*xym;}
 //  if (xmax <= xmin  || ymax <= ymin) {
 //    cerr << "PIGraphicUC::SetUCS() Error - xmax <= xmin  || ymax <= ymin ! " << endl;