From b796bb014639a30245f336c1761d5e88438a5651 Mon Sep 17 00:00:00 2001 From: Chandra Prakash Date: Sun, 3 Mar 2019 18:14:03 -0500 Subject: [PATCH] guava library updated to 27.0.1 upgraded guava library to 27.0.1 added javadoc --- algorithms-miscellaneous-1/pom.xml | 2 +- .../ApacheCommonsCombinationGenerator.java | 16 +++++++++-- .../IterativeCombinationGenerator.java | 11 ++++++-- ...electionRecursiveCombinationGenerator.java | 16 ++++++++++- .../SetRecursiveCombinationGenerator.java | 28 +++++++++++++------ 5 files changed, 59 insertions(+), 14 deletions(-) diff --git a/algorithms-miscellaneous-1/pom.xml b/algorithms-miscellaneous-1/pom.xml index 0d528023d6..30130208f8 100644 --- a/algorithms-miscellaneous-1/pom.xml +++ b/algorithms-miscellaneous-1/pom.xml @@ -82,7 +82,7 @@ 3.6.1 3.9.0 1.11 - 25.1-jre + 27.0.1-jre \ No newline at end of file diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/ApacheCommonsCombinationGenerator.java b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/ApacheCommonsCombinationGenerator.java index 4ec36927fa..40142ce940 100644 --- a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/ApacheCommonsCombinationGenerator.java +++ b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/ApacheCommonsCombinationGenerator.java @@ -7,11 +7,23 @@ import org.apache.commons.math3.util.CombinatoricsUtils; public class ApacheCommonsCombinationGenerator { - public static void main(String[] args) { - Iterator iterator = CombinatoricsUtils.combinationsIterator(5, 3); + private static final int N = 6; + private static final int R = 3; + + /** + * Print all combinations of r elements from a set + * @param n - number of elements in set + * @param r - number of elements in selection + */ + public static void generate(int n, int r) { + Iterator iterator = CombinatoricsUtils.combinationsIterator(n, r); while (iterator.hasNext()) { final int[] combination = iterator.next(); System.out.println(Arrays.toString(combination)); } } + + public static void main(String[] args) { + generate(N, R); + } } \ No newline at end of file diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/IterativeCombinationGenerator.java b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/IterativeCombinationGenerator.java index a0c7222717..676d2f41e3 100644 --- a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/IterativeCombinationGenerator.java +++ b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/IterativeCombinationGenerator.java @@ -5,14 +5,21 @@ import java.util.Arrays; import java.util.List; public class IterativeCombinationGenerator { - + private static final int N = 5; private static final int R = 2; + /** + * Generate all combinations of r elements from a set + * @param n the number of elements in input set + * @param r the number of elements in a combination + * @return the list containing all combinations + */ public List generate(int n, int r) { List combinations = new ArrayList<>(); int[] combination = new int[r]; + // initialize with lowest lexicographic combination for (int i = 0; i < r; i++) { combination[i] = i; } @@ -20,6 +27,7 @@ public class IterativeCombinationGenerator { while (combination[r - 1] < n) { combinations.add(combination.clone()); + // generate next combination in lexicographic order int t = r - 1; while (t != 0 && combination[t] == n - r + t) { t--; @@ -41,5 +49,4 @@ public class IterativeCombinationGenerator { System.out.println(Arrays.toString(combination)); } } - } diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SelectionRecursiveCombinationGenerator.java b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SelectionRecursiveCombinationGenerator.java index 400042b137..52305b8c2f 100644 --- a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SelectionRecursiveCombinationGenerator.java +++ b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SelectionRecursiveCombinationGenerator.java @@ -9,12 +9,26 @@ public class SelectionRecursiveCombinationGenerator { private static final int N = 6; private static final int R = 3; + /** + * Generate all combinations of r elements from a set + * @param n - number of elements in input set + * @param r - number of elements to be chosen + * @return the list containing all combinations + */ public List generate(int n, int r) { List combinations = new ArrayList<>(); helper(combinations, new int[r], 0, n - 1, 0); return combinations; } + /** + * Choose elements from set by recursing over elements selected + * @param combinations - List to store generated combinations + * @param data - current combination + * @param start - starting element of remaining set + * @param end - last element of remaining set + * @param index - number of elements chosen so far. + */ private void helper(List combinations, int data[], int start, int end, int index) { if (index == data.length) { int[] combination = data.clone(); @@ -31,9 +45,9 @@ public class SelectionRecursiveCombinationGenerator { public static void main(String[] args) { SelectionRecursiveCombinationGenerator generator = new SelectionRecursiveCombinationGenerator(); List combinations = generator.generate(N, R); - System.out.println(combinations.size()); for (int[] combination : combinations) { System.out.println(Arrays.toString(combination)); } + System.out.printf("generated %d combinations of %d items from %d ", combinations.size(), R, N); } } diff --git a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SetRecursiveCombinationGenerator.java b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SetRecursiveCombinationGenerator.java index 60c1c229b9..a73447b31d 100644 --- a/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SetRecursiveCombinationGenerator.java +++ b/algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/combination/SetRecursiveCombinationGenerator.java @@ -6,33 +6,45 @@ import java.util.List; public class SetRecursiveCombinationGenerator { - private static final int N = 6; - private static final int R = 3; + private static final int N = 5; + private static final int R = 2; + /** + * Generate all combinations of r elements from a set + * @param n - number of elements in set + * @param r - number of elements in selection + * @return the list containing all combinations + */ public List generate(int n, int r) { List combinations = new ArrayList<>(); - helper(combinations, new int[r], 0, n - 1, 0, r); + helper(combinations, new int[r], 0, n-1, 0); return combinations; } - private void helper(List combinations, int data[], int start, int end, int index, int r) { + /** + * @param combinations - List to contain the generated combinations + * @param data - List of elements in the selection + * @param start - index of the starting element in the remaining set + * @param end - index of the last element in the set + * @param index - number of elements selected so far + */ + private void helper(List combinations, int data[], int start, int end, int index) { if (index == data.length) { int[] combination = data.clone(); combinations.add(combination); - } else if (start <= end) { data[index] = start; - helper(combinations, data, start + 1, end, index + 1, r); - helper(combinations, data, start + 1, end, index, r); + helper(combinations, data, start + 1, end, index + 1); + helper(combinations, data, start + 1, end, index); } } public static void main(String[] args) { SetRecursiveCombinationGenerator generator = new SetRecursiveCombinationGenerator(); List combinations = generator.generate(N, R); - System.out.println(combinations.size()); for (int[] combination : combinations) { System.out.println(Arrays.toString(combination)); } + System.out.printf("generated %d combinations of %d items from %d ", combinations.size(), R, N); } }