summaryrefslogtreecommitdiff
path: root/src/Q3
diff options
context:
space:
mode:
authormokha <mokha@cisco.com>2019-05-05 19:57:14 -0600
committermokha <mokha@cisco.com>2019-05-05 19:57:14 -0600
commit7b4cb6a2eef3a0fcde7e998832427c73599e4a0a (patch)
tree75acc7cd8f3bd8a087e909db182c9e18a66879a1 /src/Q3
parent99a28d2dba93642e89a62ecf905a3bd4f138318d (diff)
use the exact naming convention for directories described by instructor
Diffstat (limited to 'src/Q3')
-rw-r--r--src/Q3/CartesianCoordinateSystem.java7
-rw-r--r--src/Q3/CartesianCoordinateSystemTest.java22
2 files changed, 29 insertions, 0 deletions
diff --git a/src/Q3/CartesianCoordinateSystem.java b/src/Q3/CartesianCoordinateSystem.java
new file mode 100644
index 0000000..d6681f9
--- /dev/null
+++ b/src/Q3/CartesianCoordinateSystem.java
@@ -0,0 +1,7 @@
+package ca.mokhan.assignment1;
+
+public class CartesianCoordinateSystem {
+ public double calculateDistance(double x1, double y1, double x2, double y2) {
+ return Math.round(Math.pow(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2), 0.5) * 100) / 100.0;
+ }
+}
diff --git a/src/Q3/CartesianCoordinateSystemTest.java b/src/Q3/CartesianCoordinateSystemTest.java
new file mode 100644
index 0000000..6696ce1
--- /dev/null
+++ b/src/Q3/CartesianCoordinateSystemTest.java
@@ -0,0 +1,22 @@
+package ca.mokhan.assignment1;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class CartesianCoordinateSystemTest extends TestCase {
+ private CartesianCoordinateSystem subject;
+
+ public CartesianCoordinateSystemTest(String testName) {
+ super(testName);
+ this.subject = new CartesianCoordinateSystem();
+ }
+
+ public static Test suite() {
+ return new TestSuite(CartesianCoordinateSystemTest.class);
+ }
+
+ public void testDistanceBetweenPoints() {
+ assertEquals(7.28, subject.calculateDistance(-2, -3, -4, 4));
+ }
+}