finished

src/Complex.java

@@ -29,23 +29,41 @@ 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 imag_string = Double.toString(imag);
+    String real_string = Double.toString(real);
+    if (real!=0) {
+      if (imag!=0) {
+        if (imag<0) {
+          String imag_string_ = imag_string.replace("-","");
+          return real_string+" - "+"j"+imag_string_;
+        }
+        return real_string+" + "+"j"+imag_string;
+      }
+      else {
+        return real_string;
+      }
+    }
+    else {
+      return "j"+imag_string;
+    }
+    
   }
 
   public Complex add(Complex complexNum)
   {
     Complex answer = new Complex(0.0,0.0);
-
+    answer.real = complexNum.real + real;
+    answer.imag = complexNum.imag + imag;
     return answer;
   }