重置测试框架

Author: ice1000

src/ice1000/models/Area.kt

@@ -33,4 +33,15 @@ abstract class Area(val origin: BufferedImage) {
 		Line(this, point).set.forEach { p -> if (this@Area[p.x, p.y]) return false }
 		return true
 	}
+
+	private fun Point.legal() = x >= 0 && y >= 0 && x < origin.width && y < origin.height
+
+//	fun drawArea(point: Point): Set<Point> {
+//		val queue = LinkedBlockingQueue<Point>()
+//		val set = HashSet<Point>()
+//		queue.put(point)
+//		while (queue.isNotEmpty()) {
+//			queue.peek()
+//		}
+//	}
 }

src/ice1000/models/Line.kt

@@ -16,12 +16,12 @@ open class Line(one: Point, two: Point) {
 	val set = HashSet<Point>()
 
 	init {
-		(Math.min(one.x, two.x)..Math.max(one.x, two.x)).forEach { x -> if (b != 0) set.add(Point(x, x2y(x))) }
-		(Math.min(one.y, two.y)..Math.max(one.y, two.y)).forEach { y -> if (a != 0) set.add(Point(y2x(y), y)) }
+		(Math.min(one.x, two.x)..Math.max(one.x, two.x)).forEach { x -> set.add(Point(x, x2y(x))) }
+		(Math.min(one.y, two.y)..Math.max(one.y, two.y)).forEach { y -> set.add(Point(y2x(y), y)) }
 	}
 
-	fun x2y(x: Int) = -(a * x + c) / b
-	fun y2x(y: Int) = -(b * y + c) / a
+	fun x2y(x: Int) = if (b == 0) c / a else -(a * x + c) / b
+	fun y2x(y: Int) = if (a == 0) c / b else -(b * y + c) / a
 
 	override operator fun equals(other: Any?): Boolean {
 		if (other == null || other !is Line) return false

src/ice1000/models/Point.kt

@@ -4,16 +4,7 @@ package ice1000.models
  * @author ice1000
  * Created by ice1000 on 2016/8/8.
  */
-data class Point(val x: Int, val y: Int) {
-
-	var quadrant = 0
-
-	/** 计算象限 */
-	init {
-		quadrant += if (x >= 0) 1 else 2
-		quadrant += if (y >= 0) 0 else 3
-		if (quadrant == 5) quadrant = 3
-	}
+open class Point(val x: Int, val y: Int) {
 
 	/** 计算两点距离 */
 	infix fun distance(p: Point) = Math.sqrt(((p.x - x) * (p.x - x) + (p.y - y) * (p.y - y)).toDouble()).toInt()
@@ -28,7 +19,6 @@ data class Point(val x: Int, val y: Int) {
 	override fun hashCode(): Int {
 		var result = x
 		result = 31 * result + y
-		result = 31 * result + quadrant
 		return result
 	}
 }

src/ice1000/models/Position.kt

@@ -0,0 +1,18 @@
+package ice1000.models
+
+/**
+ * @author ice1000
+ * Created by ice1000 on 2016/8/11.
+ */
+class Position(x: Int, y: Int): Point(x, y) {
+
+	var quadrant = 0
+
+	/** 计算象限 */
+	init {
+		quadrant += if (x >= 0) 1 else 2
+		quadrant += if (y >= 0) 0 else 3
+		if (quadrant == 5) quadrant = 3
+	}
+
+}

test/core/Test.java

@@ -1,10 +1,11 @@
 package core;
 
-import core.models.PointTest;
-
 /**
+ * My own test framework.
+ * Created by ice1000 on 2016/8/8.
+ *
  * @author ice1000
- *         Created by ice1000 on 2016/8/8.
+ *         <p>
  */
 public class Test {
 
@@ -25,11 +26,16 @@ protected void assertEqual(Object x, Object y) {
 		if (x != y && !x.equals(y)) throw new AssertionError();
 	}
 
-	protected void run() {
-		assertEqual(1 + 2, 3);
+	/**
+	 * show an object on console (calling toString)
+	 *
+	 * @param any object to show
+	 */
+	protected void show(Object any) {
+		System.out.println("[type: " + any.getClass().toString() + ", value: " + any.toString() + ']');
 	}
 
-	public static void main(String[] args) {
-		new PointTest();
+	protected void run() {
+		assertEqual(1 + 2, 3);
 	}
 }

test/core/models/PointTest.java

@@ -4,17 +4,18 @@
 import ice1000.models.Point;
 
 /**
+ * Created by ice1000 on 2016/8/11.
  * @author ice1000
- * Created by ice1000 on 2016/8/8.
  */
-public class PointTest extends Test {
-
+public class PointTest extends Test{
 	@Override
 	protected void run() {
-		assertEqual(new Point(1, 1).getQuadrant(), 1);
-		assertEqual(new Point(-1, 1).getQuadrant(), 2);
-		assertEqual(new Point(-1, -1).getQuadrant(), 3);
-		assertEqual(new Point(1, -1).getQuadrant(), 4);
 		assertEqual(new Point(1, 2), new Point(1, 2));
+		assertEqual(new Point(1, 1).distance(new Point(2, 1)), 1);
+		show(new Point(0, 0).distance(new Point(1, 1)));
+	}
+
+	public static void main(String[] args) {
+		new PointTest();
 	}
 }

test/core/models/PositionTest.java

@@ -0,0 +1,23 @@
+package core.models;
+
+import core.Test;
+import ice1000.models.Position;
+
+/**
+ * Created by ice1000 on 2016/8/8.
+ * @author ice1000
+ */
+public class PositionTest extends Test {
+
+	@Override
+	protected void run() {
+		assertEqual(new Position(1, 1).getQuadrant(), 1);
+		assertEqual(new Position(-1, 1).getQuadrant(), 2);
+		assertEqual(new Position(-1, -1).getQuadrant(), 3);
+		assertEqual(new Position(1, -1).getQuadrant(), 4);
+	}
+
+	public static void main(String[] args) {
+		new PositionTest();
+	}
+}