Implement descriptive toString() methods for RectRegion and related classes (halfhp#44)

Jonathan727 · halfhp · commit ef94704bf105 · 2017-05-22T22:23:23.000-05:00
adds more descriptive toString implementations to various classes
diff --git a/androidplot-core/src/main/java/com/androidplot/Region.java b/androidplot-core/src/main/java/com/androidplot/Region.java
@@ -17,7 +17,7 @@
 
 package com.androidplot;
 
-import com.androidplot.util.*;
+import com.androidplot.util.FastNumber;
 
 /**
  * A one dimensional region represented by a starting and ending value.
@@ -249,4 +249,20 @@ public void setMax(Number max) {
     public boolean isDefined() {
         return min != null && max != null;
     }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("Region{");
+        sb.append("min=").append(min);
+        sb.append(", max=").append(max);
+        sb.append(", cachedLength=").append(cachedLength);
+        sb.append(", defaults=");
+        if (defaults != this) {
+            sb.append(defaults);
+        } else {
+            sb.append("this");
+        }
+        sb.append('}');
+        return sb.toString();
+    }
 }
diff --git a/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java b/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java
@@ -63,4 +63,9 @@ public double doubleValue() {
         }
         return doublePrimitive;
     }
+
+    @Override
+    public String toString() {
+        return String.valueOf(doubleValue());
+    }
 }
diff --git a/androidplot-core/src/main/java/com/androidplot/util/SeriesUtils.java b/androidplot-core/src/main/java/com/androidplot/util/SeriesUtils.java
@@ -16,10 +16,14 @@
 
 package com.androidplot.util;
 
-import com.androidplot.*;
-import com.androidplot.xy.*;
+import com.androidplot.Region;
+import com.androidplot.xy.FastXYSeries;
+import com.androidplot.xy.OrderedXYSeries;
+import com.androidplot.xy.RectRegion;
+import com.androidplot.xy.XYConstraints;
+import com.androidplot.xy.XYSeries;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * Utilities for dealing with Series data.
@@ -83,18 +87,18 @@ public static RectRegion minMax(XYConstraints constraints, XYSeries... seriesArr
 
                 // if this is an advanced xy series then minMax have already been calculated for us:
                 if(series instanceof FastXYSeries) {
-                    final RectRegion b = ((FastXYSeries) series).minMax();
-                    if(b == null) {
+                    final RectRegion seriesBounds = ((FastXYSeries) series).minMax();
+                    if (seriesBounds == null) {
                         continue;
                     }
                     if(constraints == null) {
-                        bounds.union(b);
+                        bounds.union(seriesBounds);
                     } else {
-                        if(constraints.contains(b.getMinX(), b.getMinY())) {
-                            bounds.union(b.getMinX(), b.getMinY());
+                        if (constraints.contains(seriesBounds.getMinX(), seriesBounds.getMinY())) {
+                            bounds.union(seriesBounds.getMinX(), seriesBounds.getMinY());
                         }
-                        if(constraints.contains(b.getMaxX(), b.getMaxY())) {
-                            bounds.union(b.getMaxX(), b.getMaxY());
+                        if (constraints.contains(seriesBounds.getMaxX(), seriesBounds.getMaxY())) {
+                            bounds.union(seriesBounds.getMaxX(), seriesBounds.getMaxY());
                         }
                     }
 
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/RectRegion.java b/androidplot-core/src/main/java/com/androidplot/xy/RectRegion.java
@@ -20,6 +20,7 @@
 import android.graphics.RectF;
 
 import com.androidplot.Region;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -344,4 +345,13 @@ public boolean isFullyDefined() {
     public boolean contains(Number x, Number y) {
         return getxRegion().contains(x) && getyRegion().contains(y);
     }
+
+    @Override
+    public String toString() {
+        return "RectRegion{" +
+                "xRegion=" + xRegion +
+                ", yRegion=" + yRegion +
+                ", label='" + label + '\'' +
+                '}';
+    }
 }
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java b/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java
@@ -18,6 +18,7 @@
 
 /**
  * Calculates the min/max constraints for an xy plane.
+ *
  * @since 0.9.7
  */
 public class XYConstraints {
@@ -52,26 +53,26 @@ public XYConstraints(Number minX, Number maxX, Number minY, Number maxY) {
     }
 
     public boolean contains(Number x, Number y) {
-        if(x == null || y == null) {
+        if (x == null || y == null) {
             // this is essentially an invisible point:
             return false;
-        } else {
-            final double dx = x.doubleValue();
-
-            if(minX != null && dx < minX.doubleValue()) {
-                return false;
-            } else if(maxX != null && dx > maxX.doubleValue()) {
-               return false;
-            } else {
-                final double dy = y.doubleValue();
-                if(minY != null && dy < minY.doubleValue()) {
-                    return false;
-                } else if(maxY != null && dy > maxY.doubleValue()) {
-                    return false;
-                }
-            }
-            return true;
         }
+
+        final double dx = x.doubleValue();
+        if (minX != null && dx < minX.doubleValue()) {
+            return false;
+        } else if (maxX != null && dx > maxX.doubleValue()) {
+            return false;
+        }
+
+        final double dy = y.doubleValue();
+        if (minY != null && dy < minY.doubleValue()) {
+            return false;
+        } else if (maxY != null && dy > maxY.doubleValue()) {
+            return false;
+        }
+
+        return true;
     }
 
     public Number getMinX() {
@@ -153,4 +154,21 @@ public void setMinY(Number minY) {
     public void setMaxY(Number maxY) {
         this.maxY = maxY;
     }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("XYConstraints{");
+        sb.append("domainFramingModel=").append(domainFramingModel);
+        sb.append(", rangeFramingModel=").append(rangeFramingModel);
+        sb.append(", domainUpperBoundaryMode=").append(domainUpperBoundaryMode);
+        sb.append(", domainLowerBoundaryMode=").append(domainLowerBoundaryMode);
+        sb.append(", rangeUpperBoundaryMode=").append(rangeUpperBoundaryMode);
+        sb.append(", rangeLowerBoundaryMode=").append(rangeLowerBoundaryMode);
+        sb.append(", minX=").append(minX);
+        sb.append(", maxX=").append(maxX);
+        sb.append(", minY=").append(minY);
+        sb.append(", maxY=").append(maxY);
+        sb.append('}');
+        return sb.toString();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,9 @@ public double doubleValue() {`
`63`	`63`	`}`
`64`	`64`	`return doublePrimitive;`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ @Override`
	`68`	`+ public String toString() {`
	`69`	`+ return String.valueOf(doubleValue());`
	`70`	`+ }`
`66`	`71`	`}`