Changeset 185

Timestamp:

03/19/14 00:14:52 (11 years ago)

Author:

Maciej Komosinski

Message:

Avoid "atan2: domain error"

Location:

cpp

Files:

• common/Convert.h (modified) (2 diffs)
• frams/genetics/fF/conv_fF.cpp (modified) (2 diffs)

cpp/common/Convert.h

@@ -33 +33 @@
   static double toRadians(double kat) {return kat*M_PI/180;}
   static double toDegrees(double kat) {return kat/M_PI*180;}
-  static double atan_2(double y,double x) {if (x==0 && y==0) return 0; else return atan2(y,x);}
+  static double atan_2(double y,double x) {if (x==0 && y==0) return 0; else return atan2(y,x);} //needed by borland 5/6 only?
 
         static double odleglosc_sq(double x1,double y1,double x2,double y2) //odleglosc do kwadratu, wystarczy do porownywania
@@ -75 +75 @@
 
 
-
 #endif

cpp/frams/genetics/fF/conv_fF.cpp

@@ -7 +7 @@
 #include <frams/model/model.h>
 #include <common/nonstd_stl.h>
+#include <common/Convert.h>
 
 GenoConv_fF0::GenoConv_fF0()
@@ -126 +127 @@
                 double angle;
 
-                angle = atan2(pzyprim, pzxprim);
+                angle = Convert::atan_2(pzyprim, pzxprim);
                 double alpha = angle - alpha_;