commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject [1/6] commons-complex git commit: [COMPLEX-1] Use Precision.equals() in TestUtils where appropriate. Use IllegalArgumentException in ComplexUtils instead of RuntimeException
Date Sun, 08 Jan 2017 03:28:14 GMT
Repository: commons-complex
Updated Branches:
  refs/heads/master 7524db548 -> b206d9c80


[COMPLEX-1] Use Precision.equals() in TestUtils where appropriate.
Use IllegalArgumentException in ComplexUtils instead of RuntimeException


Project: http://git-wip-us.apache.org/repos/asf/commons-complex/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-complex/commit/c11baf2d
Tree: http://git-wip-us.apache.org/repos/asf/commons-complex/tree/c11baf2d
Diff: http://git-wip-us.apache.org/repos/asf/commons-complex/diff/c11baf2d

Branch: refs/heads/master
Commit: c11baf2d397134c700b17a1603b041d49e2af01e
Parents: f7cca80
Author: Ray DeCampo <ray@decampo.org>
Authored: Sat Jan 7 11:58:40 2017 -0500
Committer: Ray DeCampo <ray@decampo.org>
Committed: Sat Jan 7 11:58:40 2017 -0500

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 .../apache/commons/complex/ComplexUtils.java    |  4 ++--
 .../org/apache/commons/complex/TestUtils.java   | 25 ++++----------------
 3 files changed, 7 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-complex/blob/c11baf2d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7410e55..159f039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ site-content
 *~
 /.externalToolBuilders/
 /maven-eclipse.xml
+nb-configuration.xml

http://git-wip-us.apache.org/repos/asf/commons-complex/blob/c11baf2d/src/main/java/org/apache/commons/complex/ComplexUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/complex/ComplexUtils.java b/src/main/java/org/apache/commons/complex/ComplexUtils.java
index ffa6b39..ff131cf 100755
--- a/src/main/java/org/apache/commons/complex/ComplexUtils.java
+++ b/src/main/java/org/apache/commons/complex/ComplexUtils.java
@@ -1404,11 +1404,11 @@ public class ComplexUtils {
     }
 
     private static void illegalArgument() {
-    	throw new RuntimeException("ComplexUtils: Illegal argument");
+    	throw new IllegalArgumentException("ComplexUtils: Illegal argument");
     }
 
     private static void outOfRange() {
-    	throw new RuntimeException("ComplexUtils: Out of range");
+    	throw new IllegalArgumentException("ComplexUtils: Out of range");
     }
 
 }

http://git-wip-us.apache.org/repos/asf/commons-complex/blob/c11baf2d/src/test/java/org/apache/commons/complex/TestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/complex/TestUtils.java b/src/test/java/org/apache/commons/complex/TestUtils.java
index 56ffd80..63a2e65 100755
--- a/src/test/java/org/apache/commons/complex/TestUtils.java
+++ b/src/test/java/org/apache/commons/complex/TestUtils.java
@@ -181,8 +181,8 @@ public class TestUtils {
     public static void assertContains(String msg, Complex[] values,
                                       Complex z, double epsilon) {
         for (Complex value : values) {
-            if (equals(value.getReal(), z.getReal(), epsilon) &&
-                equals(value.getImaginary(), z.getImaginary(), epsilon)) {
+            if (Precision.equals(value.getReal(), z.getReal(), epsilon) &&
+                Precision.equals(value.getImaginary(), z.getImaginary(), epsilon)) {
                 return;
             }
         }
@@ -212,7 +212,7 @@ public class TestUtils {
     public static void assertContains(String msg, double[] values,
             double x, double epsilon) {
         for (double value : values) {
-            if (equals(value, x, epsilon)) {
+            if (Precision.equals(value, x, epsilon)) {
                 return;
             }
         }
@@ -374,23 +374,6 @@ public class TestUtils {
         return positiveMassCount;
     }
 
-	/**
-     * Returns {@code true} if there is no double value strictly between the
-     * arguments or the difference between them is within the range of allowed
-     * error (inclusive). Returns {@code false} if either of the arguments
-     * is NaN.
-     *
-     * @param x First value.
-     * @param y Second value.
-     * @param eps Amount of allowed absolute error.
-     * @return {@code true} if the values are two adjacent floating point
-     * numbers or they are within range of each other.
-     */
-    private static boolean equals(double x, double y, double eps) {
-        return equals(x, y, 1) || Math.abs(y - x) <= eps;
-    }
-
-
     /**
      * Returns true if the arguments are both NaN, are equal or are within the range
      * of allowed error (inclusive).
@@ -416,7 +399,7 @@ public class TestUtils {
      * @since 2.2
      */
     private static boolean equalsIncludingNaN(double x, double y) {
-        return (x != x || y != y) ? !(x != x ^ y != y) : equals(x, y, 1);
+        return (x != x || y != y) ? !(x != x ^ y != y) : Precision.equals(x, y, 1);
     }
 
 


Mime
View raw message