Finished

src/AppTest.java

@@ -30,7 +30,6 @@ public class AppTest {
       assertEquals(0.87520335, a.argument(), 1e-6);
   }
   
-
   @Test
   public void testToString() {
       /* toString() should return a string like 1.2 + j3.4 where 1.2 is the real part
@@ -55,6 +54,4 @@ public class AppTest {
       assertEquals(19.7, c.real(), 1e-6);
       assertEquals(26.4, c.imag(), 1e-6);
   }
-  
-
 }

src/Complex.java

@@ -14,7 +14,6 @@ public class Complex {
   {
     real = r;
     imag = i;
-    double d = Math.atan2(i,r);
   }
 
   public double imag()
@@ -29,25 +28,43 @@ public class Complex {
 
   public double magnitude()
   {
-    return 1.0;
+    return Math.sqrt(Math.pow(real,2)+(Math.pow(imag,2)));
   }
 
   public double argument()
   {
-    return 1.0;
+    return Math.atan(imag/real);
   }
 
   public String toString()
   {
-    return "";
+    String imagine_string = Double.toString(imag);
+    String real_string = Double.toString(real);
+    if (real!=0) {
+      if (imag!=0) {
+        if (imag<0) {
+          String imagine_string2 = imagine_string.replace("-","");
+          return real_string+" - "+"j"+imagine_string2;
+        }
+        return real_string+" + "+"j"+imagine_string;
+      }
+      else {
+        return real_string;
+      }
+    }
+    else {
+      return "j"+imagine_string;
+    }
+    
   }
 
   public Complex add(Complex complexNum)
   {
-    Complex answer = new Complex(0.0,0.0);
-
-    return answer;
+    Complex ans = new Complex(0.0,0.0);
+    ans.real = complexNum.real + real;
+    ans.imag = complexNum.imag + imag;
+    return ans;
   }
 
 
-}
+}
\ No newline at end of file