Revamped Max and Min

yegor256 · Jun 28, 2017 · 5b8de67 · 5b8de67
1 parent 38919dc
commit 5b8de67
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 244 deletions.
diff --git a/...n/java/org/cactoos/math/package-info.java → src/main/java/org/cactoos/list/Max.java b/...n/java/org/cactoos/math/package-info.java → src/main/java/org/cactoos/list/Max.java
@@ -21,12 +21,56 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package org.cactoos.list;
+
+import java.util.Iterator;
+import org.cactoos.Scalar;
 
 /**
- * Math.
+ * Find the greater among items.
+ *
+ * <p>There is no thread-safety guarantee.
  *
  * @author Fabricio Cabral (fabriciofx@gmail.com)
  * @version $Id$
- * @since 0.6
+ * @param <T> Scalar type
+ * @since 0.9
  */
-package org.cactoos.math;
+public final class Max<T extends Comparable<T>> implements Scalar<T> {
+
+    /**
+     * Items.
+     */
+    private final Iterable<Scalar<T>> items;
+
+    /**
+     * Ctor.
+     * @param items The items
+     */
+    @SafeVarargs
+    public Max(final Scalar<T>... items) {
+        this(new ArrayAsIterable<>(items));
+    }
+
+    /**
+     * Ctor.
+     * @param items The items
+     */
+    public Max(final Iterable<Scalar<T>> items) {
+        this.items = items;
+    }
+
+    @Override
+    public T asValue() throws Exception {
+        final Iterator<Scalar<T>> iter = this.items.iterator();
+        T max = iter.next().asValue();
+        while (iter.hasNext()) {
+            final T next = iter.next().asValue();
+            if (next.compareTo(max) > 0) {
+                max = next;
+            }
+        }
+        return max;
+    }
+
+}
diff --git a/...t/java/org/cactoos/math/package-info.java → src/main/java/org/cactoos/list/Min.java b/...t/java/org/cactoos/math/package-info.java → src/main/java/org/cactoos/list/Min.java
@@ -21,12 +21,56 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package org.cactoos.list;
+
+import java.util.Iterator;
+import org.cactoos.Scalar;
 
 /**
- * Math, tests.
+ * Find the smaller among items.
+ *
+ * <p>There is no thread-safety guarantee.
  *
  * @author Fabricio Cabral (fabriciofx@gmail.com)
  * @version $Id$
- * @since 0.6
+ * @param <T> Scalar type
+ * @since 0.9
  */
-package org.cactoos.math;
+public final class Min<T extends Comparable<T>> implements Scalar<T> {
+
+    /**
+     * Items.
+     */
+    private final Iterable<Scalar<T>> items;
+
+    /**
+     * Ctor.
+     * @param items The items
+     */
+    @SafeVarargs
+    public Min(final Scalar<T>... items) {
+        this(new ArrayAsIterable<>(items));
+    }
+
+    /**
+     * Ctor.
+     * @param items The items
+     */
+    public Min(final Iterable<Scalar<T>> items) {
+        this.items = items;
+    }
+
+    @Override
+    public T asValue() throws Exception {
+        final Iterator<Scalar<T>> iter = this.items.iterator();
+        T min = iter.next().asValue();
+        while (iter.hasNext()) {
+            final T next = iter.next().asValue();
+            if (next.compareTo(min) < 0) {
+                min = next;
+            }
+        }
+        return min;
+    }
+
+}
diff --git a/src/main/java/org/cactoos/math/Max.java b/src/main/java/org/cactoos/math/Max.java
diff --git a/src/main/java/org/cactoos/math/Min.java b/src/main/java/org/cactoos/math/Min.java
diff --git a/src/test/java/org/cactoos/math/MaxTest.java → src/test/java/org/cactoos/list/MaxTest.java b/src/test/java/org/cactoos/math/MaxTest.java → src/test/java/org/cactoos/list/MaxTest.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.cactoos.math;
+package org.cactoos.list;
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -32,28 +32,33 @@
  *
  * @author Fabricio Cabral (fabriciofx@gmail.com)
  * @version $Id$
- * @since 0.7
+ * @since 0.9
  * @checkstyle JavadocMethodCheck (500 lines)
  */
 public final class MaxTest {
 
     @Test
     public void maxAmongOneTest() throws Exception {
+        final int num = 10;
         MatcherAssert.assertThat(
-            "Can't find the greater among one number",
-            // @checkstyle MagicNumber (2 lines)
-            new Max(10).asValue(),
-            Matchers.equalTo(10)
+            "Can't find the greater among one",
+            new Max<Integer>(() -> new Integer(num)).asValue(),
+            Matchers.equalTo(num)
         );
     }
 
     @Test
     public void maxAmongManyTest() throws Exception {
+        final int num = 10;
         MatcherAssert.assertThat(
-            "Can't find the greater among many numbers",
-            // @checkstyle MagicNumber (2 lines)
-            new Max(10, 5, 7, 2, 100).asValue(),
-            Matchers.equalTo(100)
+            "Can't find the greater among many",
+            new Max<Integer>(
+                () -> new Integer(num),
+                () -> new Integer(0),
+                () -> new Integer(-1),
+                () -> new Integer(2)
+             ).asValue(),
+            Matchers.equalTo(num)
         );
     }
 }