Finished class to work with complex numbers

java-tester-x · java-tester-x · commit 8fff37f2a888 · 2014-06-14T15:10:20.000+03:00
diff --git a/src/MyComplex.java b/src/MyComplex.java
@@ -40,11 +40,11 @@ public boolean isImaginary() {
     }
 
     public boolean equals(double real, double imag) {
-        return (thix.real == real && this.imag = imag);
+        return (this.real == real && this.imag == imag);
     }
 
     public boolean equals(MyComplex another) {
-        return (thix.real == another.getReal() && this.imag = another.getImag());
+        return (real == another.getReal() && imag == another.getImag());
     }
 
     public double magnitude() {
@@ -56,7 +56,7 @@ public double argumentInRadians() {
     }
 
     public int argumentInDegrees() {
-        
+        return 0;        
     }
 
     public MyComplex conjugate() {
@@ -73,18 +73,23 @@ public MyComplex substract(MyComplex another) {
 
     public MyComplex multiplyWith(MyComplex another) {
         // (ac - bd) + (ad + bc)i
-        return new MyComplex(
-            real*another.getReal() - imag*another.getImag()
-        ,   real*another.getImag() + imag*another.getReal()
-        );
+        real = real*another.getReal() - imag*another.getImag();
+        imag = real*another.getImag() + imag*another.getReal();
+        return this;
     }
 
     public MyComplex divideBy(MyComplex another) {
         // [(a + bi) * (c – di)] / (c2 + d2)
-        
+        MyComplex tmp = multiplyWith(another.conjugate());
+        double delimiter = another.getReal()*another.getReal() + another.getImag()*another.getImag();
+        if (delimiter != 0) {
+            real = tmp.getReal() / delimiter;
+            imag = tmp.getImag() / delimiter;
+        }
+        return this;
     }
 
     public String toString() {
-        return "("+real " + "+ imag+"i)" ;
+        return "("+real +" + "+ imag+"i)" ;
     }
 }   
diff --git a/src/TestMyComplex.java b/src/TestMyComplex.java
@@ -1,9 +1,21 @@
 package src;
 
-public class MyComplex {
+public class TestMyComplex {
 
     public static void main(String[] args)
     {
-        
+        MyComplex c1 = new MyComplex(1.1, 2.2);
+        System.out.println("Number 1 is "+ c1);
+        System.out.println(c1 + " is "+(c1.isReal() ? "" : "NOT")+" pure real number");
+        System.out.println(c1 + " is "+(c1.isImaginary() ? "" : "NOT")+" pure imaginary number");
+
+        MyComplex c2 = new MyComplex(3.3, 4.4);
+        System.out.println("Number 2 is "+ c2);
+        System.out.println(c2 + " is "+(c2.isReal() ? "" : "NOT")+" pure real number");
+        System.out.println(c2 + " is "+(c2.isImaginary() ? "" : "NOT")+" pure imaginary number");
+
+        System.out.println(c1+" is " +(c1.equals(c2) ? "":"NOT") +" equal to "+c2);
+        System.out.println(c1+" + "+c2+" = "+c1.add(c2));
+        System.out.println(c1+" - "+c2+" = "+c1.substract(c2));
     }
 }   

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ public boolean isImaginary() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public boolean equals(double real, double imag) {`
`43`		`- return (thix.real == real && this.imag = imag);`
	`43`	`+ return (this.real == real && this.imag == imag);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public boolean equals(MyComplex another) {`
`47`		`- return (thix.real == another.getReal() && this.imag = another.getImag());`
	`47`	`+ return (real == another.getReal() && imag == another.getImag());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public double magnitude() {`
`@@ -56,7 +56,7 @@ public double argumentInRadians() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public int argumentInDegrees() {`
`59`		`-`
	`59`	`+ return 0;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public MyComplex conjugate() {`
`@@ -73,18 +73,23 @@ public MyComplex substract(MyComplex another) {`
`73`	`73`
`74`	`74`	`public MyComplex multiplyWith(MyComplex another) {`
`75`	`75`	`// (ac - bd) + (ad + bc)i`
`76`		`- return new MyComplex(`
`77`		`- realanother.getReal() - imaganother.getImag()`
`78`		`- , realanother.getImag() + imaganother.getReal()`
`79`		`- );`
	`76`	`+ real = realanother.getReal() - imaganother.getImag();`
	`77`	`+ imag = realanother.getImag() + imaganother.getReal();`
	`78`	`+ return this;`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`public MyComplex divideBy(MyComplex another) {`
`83`	`82`	`// [(a + bi) * (c – di)] / (c2 + d2)`
`84`		`-`
	`83`	`+ MyComplex tmp = multiplyWith(another.conjugate());`
	`84`	`+ double delimiter = another.getReal()another.getReal() + another.getImag()another.getImag();`
	`85`	`+ if (delimiter != 0) {`
	`86`	`+ real = tmp.getReal() / delimiter;`
	`87`	`+ imag = tmp.getImag() / delimiter;`
	`88`	`+ }`
	`89`	`+ return this;`
`85`	`90`	`}`
`86`	`91`
`87`	`92`	`public String toString() {`
`88`		`- return "("+real " + "+ imag+"i)" ;`
	`93`	`+ return "("+real +" + "+ imag+"i)" ;`
`89`	`94`	`}`
`90`	`95`	`}`