Merge pull request #2 from eugenp/master

Update master

algorithms-genetic/README.md

@@ -1,4 +1,6 @@
 ## Relevant articles:
 
 - [Introduction to Jenetics Library](http://www.baeldung.com/jenetics)
-- [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization)
+- [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization)
+- [Design a Genetic Algorithm in Java](https://www.baeldung.com/java-genetic-algorithm)
+- [The Traveling Salesman Problem in Java](https://www.baeldung.com/java-simulated-annealing-for-traveling-salesman)

algorithms-genetic/roundUpToHundred/.gitignore

@@ -1 +0,0 @@
-/bin/

algorithms-genetic/roundUpToHundred/src/com/java/src/RoundUpToHundred.java

@@ -1,20 +0,0 @@
-package com.java.src;
-
-import java.util.Scanner;
-
-public class RoundUpToHundred {
-
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-        double input = scanner.nextDouble();
-        scanner.close();
-
-        RoundUpToHundred.round(input);
-    }
-
-    static long round(double input) {
-        long i = (long) Math.ceil(input);
-        return ((i + 99) / 100) * 100;
-    };
-
-}

algorithms-genetic/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java

@@ -1,14 +0,0 @@
-package com.java.src;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class RoundUpToHundredTest {
-    @Test
-    public void givenInput_whenRound_thenRoundUpToTheNearestHundred() {
-        assertEquals("Rounded up to hundred", 100, RoundUpToHundred.round(99));
-        assertEquals("Rounded up to three hundred ", 300, RoundUpToHundred.round(200.2));
-        assertEquals("Returns same rounded value", 400, RoundUpToHundred.round(400));
-    }
-}

algorithms-genetic/src/main/java/com/baeldung/algorithms/RunAlgorithm.java

@@ -5,7 +5,6 @@ import java.util.Scanner;
 import com.baeldung.algorithms.ga.annealing.SimulatedAnnealing;
 import com.baeldung.algorithms.ga.ant_colony.AntColonyOptimization;
 import com.baeldung.algorithms.ga.binary.SimpleGeneticAlgorithm;
-import com.baeldung.algorithms.slope_one.SlopeOne;
 
 public class RunAlgorithm {
 
@@ -13,11 +12,8 @@ public class RunAlgorithm {
 		Scanner in = new Scanner(System.in);
 		System.out.println("Run algorithm:");
 		System.out.println("1 - Simulated Annealing");
-		System.out.println("2 - Slope One");
-		System.out.println("3 - Simple Genetic Algorithm");
-		System.out.println("4 - Ant Colony");
-		System.out.println("5 - Dijkstra");
-		System.out.println("6 - All pairs in an array that add up to a given sum");
+		System.out.println("2 - Simple Genetic Algorithm");
+		System.out.println("3 - Ant Colony");
 		int decision = in.nextInt();
 		switch (decision) {
 		case 1:
@@ -25,19 +21,13 @@ public class RunAlgorithm {
 					"Optimized distance for travel: " + SimulatedAnnealing.simulateAnnealing(10, 10000, 0.9995));
 			break;
 		case 2:
-			SlopeOne.slopeOne(3);
-			break;
-		case 3:
 			SimpleGeneticAlgorithm ga = new SimpleGeneticAlgorithm();
 			ga.runAlgorithm(50, "1011000100000100010000100000100111001000000100000100000000001111");
 			break;
-		case 4:
+		case 3:
 			AntColonyOptimization antColony = new AntColonyOptimization(21);
 			antColony.startAntOptimization();
 			break;
-		case 5:
-			System.out.println("Please run the DijkstraAlgorithmTest.");
-			break;
 		default:
 			System.out.println("Unknown option");
 			break;

algorithms-miscellaneous-1/README.md

@@ -9,4 +9,5 @@
 - [How to Find the Kth Largest Element in Java](http://www.baeldung.com/java-kth-largest-element)
 - [Multi-Swarm Optimization Algorithm in Java](http://www.baeldung.com/java-multi-swarm-algorithm)
 - [String Search Algorithms for Large Texts](http://www.baeldung.com/java-full-text-search-algorithms)
-- [Check If a String Contains All The Letters of The Alphabet](https://www.baeldung.com/java-string-contains-all-letters)
+- [Check If a String Contains All The Letters of The Alphabet](https://www.baeldung.com/java-string-contains-all-letters)
+- [Find the Middle Element of a Linked List](http://www.baeldung.com/java-linked-list-middle-element)

algorithms-miscellaneous-1/roundUpToHundred/.gitignore

@@ -1 +0,0 @@
-/bin/

algorithms-miscellaneous-1/roundUpToHundred/src/com/java/src/RoundUpToHundredTest.java

@@ -1,14 +0,0 @@
-package com.java.src;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class RoundUpToHundredTest {
-    @Test
-    public void givenInput_whenRound_thenRoundUpToTheNearestHundred() {
-        assertEquals("Rounded up to hundred", 100, RoundUpToHundred.round(99));
-        assertEquals("Rounded up to three hundred ", 300, RoundUpToHundred.round(200.2));
-        assertEquals("Returns same rounded value", 400, RoundUpToHundred.round(400));
-    }
-}

algorithms-miscellaneous-1/src/main/resources/maze/maze1.txt

@@ -1,12 +0,0 @@
-S ########
-#        #
-# ### ## #
-# #    # #
-# #  # # #
-# ## #####
-# #      #
-# # #  # #
-##### ####
-#   #    E
-# #    # #
-##########

algorithms-miscellaneous-1/src/main/resources/maze/maze2.txt

@@ -1,22 +0,0 @@
-S ##########################
-# #      #                 #
-# # ####   ############### #
-# # #    # #               #
-# # #### # # ###############
-# # #    # # #             #
-# # # #### ### ########### #
-# # # #        #           #
-#       ################## #
-#########    # # #       # #
-# #       #### # ####### # #
-# # ### ###  # # #       # #
-#   #       ##   # ##### # #
-##### #######  # #     # # #
-#     #       ## ## #### # #
-# ##### #######     #      #
-#       #       ############
-####### #########        # #
-#       #         ######## #
-# ####### ###### ##   #    E
-#         #         #   ## #
-############################

algorithms-miscellaneous-2/README.md

@@ -10,7 +10,6 @@
 - [A Collaborative Filtering Recommendation System in Java](http://www.baeldung.com/java-collaborative-filtering-recommendations)
 - [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
 - [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
-- [Find the Middle Element of a Linked List](http://www.baeldung.com/java-linked-list-middle-element)
 - [An Introduction to the Theory of Big-O Notation](http://www.baeldung.com/big-o-notation)
 - [Check If Two Rectangles Overlap In Java](https://www.baeldung.com/java-check-if-two-rectangles-overlap)
 - [Calculate the Distance Between Two Points in Java](https://www.baeldung.com/java-distance-between-two-points)

algorithms-miscellaneous-2/roundUpToHundred/.gitignore

@@ -1 +0,0 @@
-/bin/

algorithms-miscellaneous-2/roundUpToHundred/src/com/java/src/RoundUpToHundred.java

@@ -1,20 +0,0 @@
-package com.java.src;
-
-import java.util.Scanner;
-
-public class RoundUpToHundred {
-
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-        double input = scanner.nextDouble();
-        scanner.close();
-
-        RoundUpToHundred.round(input);
-    }
-
-    static long round(double input) {
-        long i = (long) Math.ceil(input);
-        return ((i + 99) / 100) * 100;
-    };
-
-}

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/RunAlgorithm.java

@@ -0,0 +1,28 @@
+package com.baeldung.algorithms;
+
+import java.util.Scanner;
+
+import com.baeldung.algorithms.slope_one.SlopeOne;
+
+public class RunAlgorithm {
+
+	public static void main(String[] args) throws InstantiationException, IllegalAccessException {
+		Scanner in = new Scanner(System.in);
+		System.out.println("1 - Slope One");
+		System.out.println("2 - Dijkstra");
+		int decision = in.nextInt();
+		switch (decision) {
+		case 1:
+			SlopeOne.slopeOne(3);
+			break;
+		case 2:
+			System.out.println("Please run the DijkstraAlgorithmLongRunningUnitTest.");
+			break;
+		default:
+			System.out.println("Unknown option");
+			break;
+		}
+		in.close();
+	}
+
+}

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/mercator/EllipticalMercator.java

@@ -0,0 +1,22 @@
+package com.baeldung.algorithms.mercator;
+
+class EllipticalMercator extends Mercator {
+
+    @Override
+    double yAxisProjection(double input) {
+
+        input = Math.min(Math.max(input, -89.5), 89.5);
+        double earthDimensionalRateNormalized = 1.0 - Math.pow(RADIUS_MINOR / RADIUS_MAJOR, 2);
+
+        double inputOnEarthProj = Math.sqrt(earthDimensionalRateNormalized) *  Math.sin( Math.toRadians(input));
+
+        inputOnEarthProj = Math.pow(((1.0 - inputOnEarthProj)/(1.0+inputOnEarthProj)), 0.5 * Math.sqrt(earthDimensionalRateNormalized));
+        double inputOnEarthProjNormalized = Math.tan(0.5 * ((Math.PI*0.5) -  Math.toRadians(input)))/inputOnEarthProj;
+        return (-1) * RADIUS_MAJOR * Math.log(inputOnEarthProjNormalized);
+    }
+
+    @Override
+    double xAxisProjection(double input) {
+        return RADIUS_MAJOR * Math.toRadians(input);
+    }
+}

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/mercator/Mercator.java

@@ -0,0 +1,10 @@
+package com.baeldung.algorithms.mercator;
+
+abstract class Mercator {
+    final static double RADIUS_MAJOR = 6378137.0;
+    final static double RADIUS_MINOR = 6356752.3142;
+
+    abstract double yAxisProjection(double input);
+
+    abstract double xAxisProjection(double input);
+}

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/mercator/SphericalMercator.java

@@ -0,0 +1,14 @@
+package com.baeldung.algorithms.mercator;
+
+public class SphericalMercator extends  Mercator {
+
+    @Override
+    double xAxisProjection(double input) {
+        return Math.toRadians(input) * RADIUS_MAJOR;
+    }
+
+    @Override
+    double yAxisProjection(double input) {
+        return Math.log(Math.tan(Math.PI / 4 + Math.toRadians(input) / 2)) * RADIUS_MAJOR;
+    }
+}

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/roundedup/RoundUpToHundred.java

@@ -1,4 +1,4 @@
-package com.java.src;
+package com.baeldung.algorithms.roundedup;
 
 import java.util.Scanner;
 

algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/mercator/EllipticalMercatorUnitTest.java

@@ -0,0 +1,22 @@
+package com.baeldung.algorithms.mercator;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class EllipticalMercatorUnitTest {
+
+    @Test
+    public void giventThatTheInputIs22_whenXAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
+        Mercator mercator = new EllipticalMercator();
+        double result = mercator.xAxisProjection(22);
+        Assert.assertEquals(result, 2449028.7974520186, 0.0);
+    }
+
+    @Test
+    public void giventThatTheInputIs44_whenYAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
+        Mercator mercator = new EllipticalMercator();
+        double result = mercator.yAxisProjection(44);
+        Assert.assertEquals(result, 5435749.887511954, 0.0);
+    }
+}

algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/mercator/SphericalMercatorUnitTest.java

@@ -0,0 +1,21 @@
+package com.baeldung.algorithms.mercator;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SphericalMercatorUnitTest {
+
+    @Test
+    public void giventThatTheInputIs22_whenXAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
+        Mercator mercator = new SphericalMercator();
+        double result = mercator.xAxisProjection(22);
+        Assert.assertEquals(result, 2449028.7974520186, 0.0);
+    }
+
+    @Test
+    public void giventThatTheInputIs44_whenYAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
+        Mercator mercator = new SphericalMercator();
+        double result = mercator.yAxisProjection(44);
+        Assert.assertEquals(result, 5465442.183322753, 0.0);
+    }
+}

algorithms-miscellaneous-2/src/test/java/com/baeldung/algorithms/roundedup/RoundUpToHundredUnitTest.java

@@ -1,10 +1,10 @@
-package com.java.src;
+package com.baeldung.algorithms.roundedup;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class RoundUpToHundredTest {
+public class RoundUpToHundredUnitTest {
     @Test
     public void givenInput_whenRound_thenRoundUpToTheNearestHundred() {
         assertEquals("Rounded up to hundred", 100, RoundUpToHundred.round(99));

algorithms-sorting/README.md

@@ -4,4 +4,4 @@
 - [Merge Sort in Java](https://www.baeldung.com/java-merge-sort)
 - [Quicksort Algorithm Implementation in Java](https://www.baeldung.com/java-quicksort)
 - [Insertion Sort in Java](https://www.baeldung.com/java-insertion-sort)
-
+- [Heap Sort in Java](https://www.baeldung.com/java-heap-sort)