Refactor

Author: ModestJean

src/II/_2_Traverce/Solver.java

@@ -1,14 +1,14 @@
-package II._1_Pascal;
+package Lab_II._1_Pascal;
 
 import javafx.util.Pair;
 import java.util.HashMap;
 
 public class Solver {
-
-    private static HashMap<Pair<Integer,Integer>, Integer> combinationsCache = new HashMap<>();
+    static HashMap<Pair<Integer,Integer>, Integer> combinationsCache = new HashMap<>();
+    static int n = 6;
 
     public static void main() {
-        for (int i = 1; i <= 6; i++,System.out.println())
+        for (int i = 1; i <= n; i++,System.out.println())
             for (int j = 1; j <= i; j++)
                 System.out.print(combinations(new Pair(i,j)) + " ");
     }

src/II/_1_Pascal/Solver.java renamed to src/Lab_II/_1_Pascal/Solver.java

@@ -0,0 +1,80 @@
+package Lab_II._2_Traverse;
+
+public class Solver {
+    static int n = 5;
+    static int value = 1;
+    static int[][] array = new int[n+1][n+1];
+
+    public static void main() {
+        traverseFirstWay(0,1,1);
+        printMatrix();
+
+        traverseSecondWay(1,1);
+        printMatrix();
+
+        traverseThirdWay(1);
+        printMatrix();
+    }
+
+    public static void printMatrix() {
+        for (int i = 1; i <= n; i++,System.out.println())
+            for (int j = 1; j <= n; j++)
+                System.out.printf("%3d",array[i][j]);
+        System.out.println();
+    }
+
+    public static void traverseFirstWay(int turns, int row, int col) {
+        int distance = n - (int)Math.round((float) turns / 2 + 0.25);
+        if (distance == 0) return;
+        int irow, icol;
+        switch (turns % 4) {
+            case 0: // Right
+                for (icol = col; icol < col + distance; icol++)
+                    array[row][icol] = value++;
+                traverseFirstWay(++turns, ++row, --icol); break;
+            case 1: // Down
+                for (irow = row; irow < row + distance; irow++)
+                    array[irow][col] = value++;
+                traverseFirstWay(++turns,--irow,--col); break;
+            case 2: // Left
+                for (icol = col; icol > col - distance; icol--)
+                    array[row][icol] = value++;
+                traverseFirstWay(++turns,--row,++icol); break;
+            case 3: // Up
+                for (irow = row; irow > row - distance; irow--)
+                    array[irow][col] = value++;
+                traverseFirstWay(++turns, ++irow, ++col); break;
+        }
+    }
+
+    public static void traverseSecondWay(int row, int col) {
+        array[col][row] = value++;
+        if (row == n && col == n) return;
+
+        if ((row + col) % 2 == 0)
+            if (row == n)
+                traverseSecondWay(row, ++col);
+            else
+                traverseSecondWay(++row, col == 1 ? col : --col);
+        else
+            if (col == n)
+                traverseSecondWay(++row, col);
+            else
+                traverseSecondWay(row == 1 ? row : --row, ++col);
+    }
+
+    public static void traverseThirdWay(int col) {
+        if (col > n) return;
+        else
+            if (col % 2 == 0) {
+                for (int row = n; row > 0; row--)
+                    array[row][col] = value++;
+                traverseThirdWay(++col);
+            }
+            else {
+                for (int i = 1; i <= n; i++)
+                    array[i][col] = value++;
+                traverseThirdWay(++col);
+            }
+    }
+}

src/Lab_II/_2_Traverse/Solver.java

@@ -1,4 +1,4 @@
-package III._1_Collections;
+package Lab_III._1_Collections;
 
 import java.util.Arrays;
 import java.util.Collection;

src/III/_1_Collections/Solver.java renamed to src/Lab_III/_1_Collections/Solver.java

@@ -1,4 +1,4 @@
-package III._2_Primes;
+package Lab_III._2_Primes;
 
 import java.util.Iterator;
 
@@ -20,7 +20,7 @@ public boolean hasNext() {
 
             public Integer next() {
                 while (!isPrime(from < to ? current++ : current--));
-                return current - 1;
+                return from < to ? current - 1 : current + 1;
             }
 
             private boolean isPrime(int number)
@@ -29,7 +29,7 @@ private boolean isPrime(int number)
                 if (number < 2) return false;
                 if (number < 4) return true;
                 if (number % 2 == 0) return false;
-                for (int i = 3; i < Math.ceil(Math.sqrt(number)); i+=2)
+                for (int i = 3; i < Math.sqrt(number) + 1; i+=2)
                     if (number % i == 0) return false;
                 return true;
             }

src/III/_2_Primes/PrimesGenerator.java renamed to src/Lab_III/_2_Primes/PrimesGenerator.java

@@ -1,4 +1,4 @@
-package III._2_Primes;
+package Lab_III._2_Primes;
 
 public class Solver {
     public static void main() {

src/III/_2_Primes/Solver.java renamed to src/Lab_III/_2_Primes/Solver.java

@@ -1,4 +1,4 @@
-package III._3_Comparator;
+package Lab_III._3_Comparator;
 
 import java.util.Comparator;
 

src/III/_3_Comparator/Human.java renamed to src/Lab_III/_3_Comparator/Human.java

@@ -1,4 +1,4 @@
-package III._3_Comparator;
+package Lab_III._3_Comparator;
 
 import java.util.Collection;
 import java.util.HashSet;

src/III/_3_Comparator/Solver.java renamed to src/Lab_III/_3_Comparator/Solver.java

@@ -1,11 +1,10 @@
 public class Main {
-
     public static void main(String[] args) {
-        II._1_Pascal.Solver.main();
-        II._2_Traverce.Solver.main();
+        Lab_II._1_Pascal.Solver.main();
+        Lab_II._2_Traverse.Solver.main();
 
-        III._1_Collections.Solver.main();
-        III._2_Primes.Solver.main();
-        III._3_Comparator.Solver.main();
+        Lab_III._1_Collections.Solver.main();
+        Lab_III._2_Primes.Solver.main();
+        Lab_III._3_Comparator.Solver.main();
     }
 }