forEach methods in the Tensorics API

Author: andreacalia

gradle/wrapper/gradle-wrapper.jar

@@ -1,4 +1,4 @@
-#Sat Jul 01 10:54:52 CEST 2017
+#Mon Apr 09 09:45:48 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -25,9 +25,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
+import java.util.function.*;
 import java.util.stream.Stream;
 
 import org.tensorics.core.math.ExtendedField;
@@ -369,6 +367,13 @@ public static <S, T> Tensor<T> map(Tensor<S> tensor, BiFunction<Position, S, T>
         return TensorStructurals.transformScalars(tensor, function);
     }
 
+    public static <S> void forEach(Tensor<S> tensor, Consumer<S> consumer) {
+        TensorStructurals.consumeScalars(tensor, consumer);
+    }
+
+    public static <S> void forEach(Tensor<S> tensor, BiConsumer<Position, S> consumer) {
+        TensorStructurals.consumeScalars(tensor, consumer);
+    }
     public static final Scalar<QuantifiedValue<Double>> zeroDimensionalOf(double value,
             javax.measure.unit.Unit<?> unit) {
         QuantifiedValue<Double> quantity = quantityOf(value, unit);

src/java/org/tensorics/core/lang/Tensorics.java

@@ -25,11 +25,15 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
+import org.tensorics.core.lang.Tensorics;
 import org.tensorics.core.tensor.ImmutableTensor;
 import org.tensorics.core.tensor.ImmutableTensor.Builder;
 import org.tensorics.core.tensor.Position;
@@ -151,6 +155,14 @@ public static <S, T> Tensor<T> transformScalars(Tensor<S> tensor, BiFunction<Pos
         return builder.build();
     }
 
+    public static <S> void consumeScalars(Tensor<S> tensor, Consumer<S> consumer) {
+        Tensorics.stream(tensor).map(Map.Entry::getValue).forEach(consumer);
+    }
+
+    public static <S> void consumeScalars(Tensor<S> tensor, BiConsumer<Position, S> consumer) {
+        Tensorics.stream(tensor).forEach(e -> consumer.accept(e.getKey(), e.getValue()));
+    }
+
     public static final <S> Tensor<S> stripContext(Tensor<S> tensor) {
         Builder<S> builder = ImmutableTensor.builder(tensor.shape().dimensionSet());
         builder.putAll(tensor);