Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Jun 27, 2017
2 parents a21f88e + 5553689 commit e3b5ee9
Show file tree
Hide file tree
Showing 4 changed files with 276 additions and 0 deletions.
71 changes: 71 additions & 0 deletions src/main/java/org/cactoos/list/SumOfInts.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* 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;

/**
* Int total of numbers.
*
* <p>There is no thread-safety guarantee.
*
* @author Vseslav Sekorin ([email protected])
* @version $Id$
* @since 0.9
*/
public final class SumOfInts implements Scalar<Long> {

/**
* The iterable.
*/
private final Iterable<Scalar<Number>> src;

/**
* Ctor.
* @param src Numbers
*/
@SafeVarargs
public SumOfInts(final Scalar<Number>... src) {
this(new ArrayAsIterable<>(src));
}

/**
* Ctor.
* @param src The iterable
*/
public SumOfInts(final Iterable<Scalar<Number>> src) {
this.src = src;
}

@Override
public Long value() throws Exception {
final Iterator<Scalar<Number>> numbers = this.src.iterator();
Long result = 0L;
while (numbers.hasNext()) {
result += numbers.next().value().longValue();
}
return result;
}
}
71 changes: 71 additions & 0 deletions src/main/java/org/cactoos/list/SumOfReals.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* 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;

/**
* Real total of numbers.
*
* <p>There is no thread-safety guarantee.
*
* @author Vseslav Sekorin ([email protected])
* @version $Id$
* @since 0.9
*/
public final class SumOfReals implements Scalar<Double> {

/**
* The iterable.
*/
private final Iterable<Scalar<Number>> src;

/**
* Ctor.
* @param src Numbers
*/
@SafeVarargs
public SumOfReals(final Scalar<Number>... src) {
this(new ArrayAsIterable<>(src));
}

/**
* Ctor.
* @param src The iterable
*/
public SumOfReals(final Iterable<Scalar<Number>> src) {
this.src = src;
}

@Override
public Double value() throws Exception {
final Iterator<Scalar<Number>> numbers = this.src.iterator();
Double result = 0.;
while (numbers.hasNext()) {
result += numbers.next().value().doubleValue();
}
return result;
}
}
67 changes: 67 additions & 0 deletions src/test/java/org/cactoos/list/SumOfIntsTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.cactoos.list;

import org.cactoos.Scalar;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Test;

/**
* Test case for {@link SumOfInts}.
*
* @author Vseslav Sekorin ([email protected])
* @version $Id$
* @since 0.9
* @checkstyle JavadocMethodCheck (500 lines)
* @checkstyle MagicNumberCheck (500 lines)
*/
public final class SumOfIntsTest {

@Test
public void withVarargsCtor() throws Exception {
MatcherAssert.assertThat(
new SumOfInts(
() -> 1,
() -> 2,
() -> 3
).value(),
Matchers.equalTo(6L)
);
}

@Test
public void withIterCtor() throws Exception {
MatcherAssert.assertThat(
new SumOfInts(
new ArrayAsIterable<Scalar<Number>>(
() -> 7,
() -> 8,
() -> 10
)
).value(),
Matchers.equalTo(25L)
);
}
}
67 changes: 67 additions & 0 deletions src/test/java/org/cactoos/list/SumOfRealsTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.cactoos.list;

import org.cactoos.Scalar;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Test;

/**
* Test case for {@link SumOfReals}.
*
* @author Vseslav Sekorin ([email protected])
* @version $Id$
* @since 0.9
* @checkstyle JavadocMethodCheck (500 lines)
* @checkstyle MagicNumberCheck (500 lines)
*/
public final class SumOfRealsTest {

@Test
public void withVarargsCtor() throws Exception {
MatcherAssert.assertThat(
new SumOfReals(
() -> 1.2,
() -> 2.5,
() -> 3.3
).value(),
Matchers.closeTo(7.0, 0.0)
);
}

@Test
public void withIterCtor() throws Exception {
MatcherAssert.assertThat(
new SumOfReals(
new ArrayAsIterable<Scalar<Number>>(
() -> 7.1,
() -> 8.1,
() -> 10.1
)
).value(),
Matchers.closeTo(25.0, 0.3)
);
}
}

0 comments on commit e3b5ee9

Please sign in to comment.