Changeset 738 in Sophya for trunk/SophyaLib/Samba

Timestamp:

Feb 24, 2000, 12:21:28 PM (26 years ago)

Author:

ansari

Message:

D.Y. Petite modif dans scangle pour eviter les plantages aux petits angles

File:

• trunk/SophyaLib/Samba/utilgeom.cc (modified) (1 diff)

trunk/SophyaLib/Samba/utilgeom.cc

@@ -107 +107 @@
 //
 //--
-{
-  double eps=1e-10;
-  if( fabs(1.-sinus*sinus-cosinus*cosinus) > eps || fabs(cosinus)-1. > eps || fabs(sinus)-1. > eps ) 
-    {
-      cerr << "angle non valide." << endl;
-      cerr << "sinus = " << sinus << " cosinus = " << cosinus << endl;
-      exit(0);
+{       // Modifie par D. Y. pour eviter des plantages aux petis angles
+        double eps=1.e-10;
+        if( fabs(1.-sinus*sinus-cosinus*cosinus) > eps) 
+    {      // On renormalise D.Y.
+          // cerr << "angle non valide: "<< "sinus = " << sinus << " cosinus = " << cosinus << '\n'; // BUGGG
+      double norm= cosinus*cosinus+sinus*sinus;
+      cosinus=cosinus/norm;
+      sinus=sinus/norm;     
     }
-  if( fabs(1.-fabs(cosinus)) < eps ) cosinus=1.*copysign(1.,cosinus);
-  if( fabs(1.-fabs(sinus)) < eps ) sinus=1.*copysign(1.,sinus);
-  if( fabs(sinus) == 0. ) sinus=0.;
-  if( fabs(cosinus) == 0. ) cosinus=0.;
+  if( fabs(cosinus) >1. ) cosinus=1.*copysign(1.,cosinus);
+  if( fabs(sinus) >1. ) sinus=1.*copysign(1.,sinus);
+/*  if( fabs(sinus) == 0. ) sinus=0.;
+    if( fabs(cosinus) == 0. ) cosinus=0.;
+*/
   return acos(cosinus)*copysign(1,sinus);
 }
 
-//OMatrix vecTxMat(const OVector& v, const OMatrix& M) {
-