Oriign

src/Complex.java

@@ -29,23 +29,36 @@ public class Complex {
 
   public double magnitude()
   {
-    return 1.0;
+    return Math.sqrt(real*real + imag*imag);
   }
 
   public double argument()
   {
-    return 1.0;
+    return Math.atan2(imag, real);
   }
 
   public String toString()
   {
-    return "";
+    String ans = "";
+    if (real == 0){
+      ans = "j" + imag; 
+    }else if(imag == 0) {
+      ans = Double.toString(real); 
+    }else if(imag < 0){
+      ans = Double.toString(real) + " - " + "j"+Math.abs(imag);
+    }else{
+      ans = Double.toString(real) + " + " + "j"+imag;
+    }
+
+    return ans;
   }
 
   public Complex add(Complex complexNum)
-  {
+  { 
     Complex answer = new Complex(0.0,0.0);
 
+    answer.imag = complexNum.imag() + this.imag;
+    answer.real = complexNum.real() + this.real;
     return answer;
   }