From 034ed33e47a8487fbd3fda7eb555b053d6d0545d Mon Sep 17 00:00:00 2001 From: Gilles Sadowski Date: Fri, 6 Sep 2013 16:15:34 +0000 Subject: [PATCH] Reuse method from "MathArrays". Merged "if" cases. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1520622 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/commons/math3/util/Combinations.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/commons/math3/util/Combinations.java b/src/main/java/org/apache/commons/math3/util/Combinations.java index a93c01117..e590a7167 100644 --- a/src/main/java/org/apache/commons/math3/util/Combinations.java +++ b/src/main/java/org/apache/commons/math3/util/Combinations.java @@ -131,16 +131,9 @@ public class Combinations implements Iterable { /** {@inheritDoc} */ @Override public Iterator iterator() { - if (k == 0) { - return new SingletonIterator(new int[]{}); - } - if (k == n) { - // TODO: once getNatural is extracted from RandomDataGenerator, use it - final int[] natural = new int[n]; - for (int i = 0; i < n; i++) { - natural[i] = i; - } - return new SingletonIterator(natural); + if (k == 0 || + k == n) { + return new SingletonIterator(MathArrays.natural(k)); } switch (iterationOrder) {