Лукашевич Евгений 230501

src/demo/parallel/Complex.java

@@ -84,7 +84,11 @@ public Complex times(Complex b) {
         im = imag;
         return this;
     }
-
+    public Complex minus(Complex b) {
+        re -= b.re;
+        im -= b.im;
+        return this;
+    }
     /**
      * Square of Complex object's length, we're using square of length to 
      * eliminate the computation of square root

src/demo/parallel/ComplexTest.java

@@ -0,0 +1,28 @@
+package demo.parallel;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ComplexTest {
+
+    @org.junit.jupiter.api.Test
+    void plus() {
+        Complex a = new Complex(1, 1);
+        Complex b = new Complex(2, 3);
+
+        Complex result = a.plus(b);
+
+        assertEquals(3, result.re);
+        assertEquals(4, result.im);
+    }
+
+    @org.junit.jupiter.api.Test
+    void minus() {
+        Complex a = new Complex(5, 7);
+        Complex b = new Complex(2, 3);
+
+        Complex result = a.minus(b);
+
+        assertEquals(3, result.re);
+        assertEquals(4, result.im);
+    }
+}

src/demo/parallel/Main.java

@@ -364,7 +364,7 @@ private Parent createContent(double minR, double minI, double maxR, double maxI)
         antiTranslate.xProperty().bind(canvas.translateXProperty().negate());
         antiTranslate.yProperty().bind(canvas.translateYProperty().negate());
         snapshotParameters.setTransform(antiTranslate);
-        snapshotParameters.setFill(Color.BLACK);
+        snapshotParameters.setFill(Color.WHITE);
 
         //Fetch position when Mouse released
         canvas.setOnMouseReleased(e -> {

src/demo/parallel/MandelbrotSetTask.java

@@ -40,7 +40,7 @@
 
 /**
  * Task to render Mandelbrot set using given parameters. See {@link 
- * #MandelbrotRendererTask(boolean, javafx.scene.image.PixelWriter, int, int, 
+ * #MandelbrotRendererTask(boolean, javafx.scene.image.PixelWriter, int, int,
  * double, double, double, double, double, double, double, double, boolean) 
  * constructor} for parameters list. The task returns time in milliseconds as 
  * its calculated value.
@@ -275,7 +275,7 @@ private int calc(Complex comp) {
         int count = 0;
         Complex c = new Complex(0, 0);
         do {
-            c = c.times(c).plus(comp);
+            c = c.times(c).minus(comp);
             count++;
         } while (count < CAL_MAX_COUNT && c.lengthSQ() < LENGTH_BOUNDARY);
         return count;
@@ -289,8 +289,8 @@ private int calc(Complex comp) {
      * @return calculated color of the pixel
      */
     private Color calcPixel(double x, double y) {
-        double re = (minR * (width - x) + x * maxR) / width;
-        double im = (minI * (height - y) + y * maxI) / height;
+        double re = (minR * (height - y) + x * maxR) / height;
+        double im = (minI * (width - x) + y * maxI) / width;
         Complex calPixel = new Complex(re, im);
         return getColor(calc(calPixel));
     }
@@ -351,13 +351,13 @@ private Color getColor(int count) {
          * Color stops for colors table: color values
          */
         Color[] cc = {
-            Color.rgb(40, 0, 0),
+            Color.rgb(50, 10, 0),
             Color.RED,
             Color.WHITE,
+            Color.BLUE,
+            Color.rgb(90, 20, 15),
             Color.RED,
-            Color.rgb(100, 0, 0),
-            Color.RED,
-            Color.rgb(50, 0, 0)
+            Color.rgb(44, 47, 13)
         };
 
         /**