changes for reading input files

[IRC.git] / Robust / src / ClassLibrary / Math.java

diff --git a/Robust/src/ClassLibrary/Math.java b/Robust/src/ClassLibrary/Math.java
index cd38a2e8ad44756a472ae9936ac7bbb71d73c6cb..9a7f14183f783cb6af7cc485141c49c0d342aed0 100644 (file)
--- a/Robust/src/ClassLibrary/Math.java
+++ b/Robust/src/ClassLibrary/Math.java
@@ -1,35 +1,109 @@
 public class Math {
-    //public static final double PI=3.14159265358979323846;
-    
-    public static double fabs(double x) {
-       if (x < 0) {
-           return -x;
-       } else {
-           return x;
-       }
+  static final double PI=3.14159265358979323846;
+
+  // an alias for setPI()
+  public static double PI() {
+    double PI = 3.14159265358979323846;
+    return PI;
+  }
+
+  public static int abs(int x) {
+    return (x<0)?-x:x;
+  }
+
+  public static long abs(long x) {
+    return (x<0)?-x:x;
+  }
+
+  public static double abs(double x) {
+    return (x<0)?-x:x;
+  }
+
+  public static float abs(float x) {
+    return (x<0)?-x:x;
+  }
+
+  public static double max(double a, double b) {
+    return (a>b)?a:b;
+  }
+
+  public static float max(float a, float b) {
+    return (a>b)?a:b;
+  }
+
+  public static int max(int a, int b) {
+    return (a>b)?a:b;
+  }
+
+  public static long max(long a, long b) {
+    return (a>b)?a:b;
+  }
+
+  public static double min(double a, double b) {
+    return (a<b)?a:b;
+  }
+
+  public static float min(float a, float b) {
+    return (a<b)?a:b;
+  }
+  public static int min(int a, int b) {
+    return (a<b)?a:b;
+  }
+  public static long min(long a, long b) {
+    return (a<b)?a:b;
+  }
+
+  /** sqrt(a^2 + b^2) without under/overflow. **/
+  public static double hypot(double a, double b) {
+    double r;
+    if (abs(a) > abs(b)) {
+      r = b/a;
+      r = abs(a)*sqrt(1+r*r);
+    } else if (b != 0) {
+      r = a/b;
+      r = abs(b)*sqrt(1+r*r);
+    } else {
+      r = 0.0;
     }
-    
-    public static float abs(float a) {
-       if (a<0)
-           return -a;
-       else return a;
+    return r;
+  }
+
+  public static double rint(double x) {
+    double y = ceil(x);
+    double d = y - x;
+    if( d == 0.5 ) {
+      if( ((int)y)%2 == 0 ) {
+        return y;
+      } else {
+        return y - 1.0;
+      }
+    } else if( d < 0.5 ) {
+      return y;
     }
+    return y - 1.0;
+  }
+
+  public static native double sin(double a);
+  public static native double cos(double a);
+  public static native double asin(double a);
+  public static native double acos(double a);
+  public static native double tan(double a);
+  public static native double atan(double a);
+  public static native double atan2(double a, double b);
+  public static native double exp(double a);
+  public static native double sqrt(double a);
+  public static native double log(double a);
+  public static native double pow(double a, double b);
+
+  public static native double ceil(double a);
+  public static native double floor(double a);
 
-    public static native double sin(double a);
-    public static native double cos(double a);
-    public static native double asin(double a);
-    public static native double acos(double a);
-    public static native double tan(double a);
-    public static native double atan(double a);
-    public static native double exp(double a);
-    public static native double sqrt(double a);
-    public static native double log(double a);
-    public static native double pow(double a, double b);
-    
-    public static native float sinf(float a);
-    public static native float cosf(float a);
-    public static native float expf(float a);
-    public static native float sqrtf(float a);
-    public static native float logf(float a);
-    public static native float powf(float a, float b);
+  public static native float sinf(float a);
+  public static native float cosf(float a);
+  public static native float expf(float a);
+  public static native float sqrtf(float a);
+  public static native float logf(float a);
+  public static native float powf(float a, float b);
+  public static native float ceilf(float a);
+  public static native float IEEEremainder(float f1, float f2);
 }