Some new convenience methods

Author: kaifox

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

@@ -25,6 +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.stream.Stream;
@@ -194,6 +195,14 @@ public static <V, TB extends Tensorbacked<V>> TB empty(Class<TB> tensorbackedCla
         return Tensorbackeds.empty(tensorbackedClass);
     }
 
+    public static <V> Tensor<V> empty(Iterable<Class<?>> dimensions) {
+        return ImmutableTensor.<V> builder(dimensions).build();
+    }
+
+    public static <V> Tensor<V> empty(Class<?> ... dimensions) {
+        return ImmutableTensor.<V> builder(dimensions).build();
+    }
+
     /**
      * @see Tensorbackeds#validitiesOf(Tensorbacked)
      */
@@ -237,6 +246,13 @@ public static <S> Tensor<QuantifiedValue<S>> quantityTensorOf(Tensor<S> tensor,
         return QuantityTensors.quantityTensorOf(tensor, unit);
     }
 
+    /**
+     * @see QuantityTensors#quantityTensorOf(Tensor, javax.measure.unit.Unit)
+     */
+    public static <S> Tensor<QuantifiedValue<S>> quantityTensorOf(Tensor<S> tensor, javax.measure.unit.Unit<?> unit) {
+        return QuantityTensors.quantityTensorOf(tensor, JScienceUnit.of(unit));
+    }
+
     /**
      * @see QuantityTensors#unitOf(Tensor)
      */
@@ -309,18 +325,38 @@ public static <S> Tensor<S> sameValues(Shape shape, S value) {
         return TensorInternals.sameValues(shape, value);
     }
 
+    /**
+     * @deprecated use {@link #tensor(Shape, Supplier)}
+     */
+    @Deprecated
     public static <S> Tensor<S> createFrom(Shape shape, Supplier<S> supplier) {
+        return tensor(shape, supplier);
+    }
+
+    public static <S> Tensor<S> tensor(Shape shape, Supplier<S> supplier) {
         return TensorInternals.createFrom(shape, supplier);
     }
 
+    /**
+     * @deprecated use {@link #tensor(Shape, Function)}
+     */
+    @Deprecated
     public static <S> Tensor<S> createFrom(Shape shape, Function<Position, S> function) {
+        return tensor(shape, function);
+    }
+
+    public static <S> Tensor<S> tensor(Shape shape, Function<Position, S> function) {
         return TensorInternals.createFrom(shape, function);
     }
 
     public static <S> OngoingCompletion<S> complete(Tensor<S> tensor) {
         return TensorStructurals.complete(tensor);
     }
 
+    /**
+     * @deprecated use {@link #map(Tensor, BiFunction)} instead
+     */
+    @Deprecated
     public static <S, T> Tensor<T> transformEntries(Tensor<S> tensor, Function<Entry<Position, S>, T> function) {
         return TensorStructurals.transformEntries(tensor, function);
     }
@@ -329,6 +365,10 @@ public static <S, T> Tensor<T> map(Tensor<S> tensor, Function<S, T> function) {
         return TensorStructurals.transformScalars(tensor, function);
     }
 
+    public static <S, T> Tensor<T> map(Tensor<S> tensor, BiFunction<Position, S, T> function) {
+        return TensorStructurals.transformScalars(tensor, function);
+    }
+
     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/tensor/lang/QuantityTensors.java

@@ -29,6 +29,7 @@
 import org.tensorics.core.tensor.Position;
 import org.tensorics.core.tensor.Tensor;
 import org.tensorics.core.tensor.operations.TensorInternals;
+import org.tensorics.core.units.JScienceUnit;
 import org.tensorics.core.units.Unit;
 
 import com.google.common.base.Optional;
@@ -83,6 +84,10 @@ public static <S> Tensor<Boolean> validitiesOf(Tensor<QuantifiedValue<S>> tensor
         return builder.build();
     }
 
+    public static <S> Tensor<QuantifiedValue<S>> quantityTensorOf(Tensor<S> tensor, javax.measure.unit.Unit<?> unit) {
+        return quantityTensorOf(tensor, JScienceUnit.of(unit));
+    }
+    
     public static <S> Tensor<QuantifiedValue<S>> quantityTensorOf(Tensor<S> tensor, Unit unit) {
         Builder<QuantifiedValue<S>> builder = ImmutableTensor.builder(tensor.shape().dimensionSet());
         builder.context(tensor.context());

src/java/org/tensorics/core/tensor/lang/TensorStructurals.java

@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.tensorics.core.tensor.ImmutableTensor;
@@ -141,6 +142,15 @@ public static <S, T> Tensor<T> transformScalars(Tensor<S> tensor, Function<S, T>
         return builder.build();
     }
 
+    public static <S, T> Tensor<T> transformScalars(Tensor<S> tensor, BiFunction<Position, S, T> function) {
+        Builder<T> builder = ImmutableTensor.builder(tensor.shape().dimensionSet());
+        builder.context(tensor.context());
+        for (Entry<Position, S> entry : TensorInternals.mapFrom(tensor).entrySet()) {
+            builder.put(entry.getKey(), function.apply(entry.getKey(), entry.getValue()));
+        }
+        return builder.build();
+    }
+
     public static final <S> Tensor<S> stripContext(Tensor<S> tensor) {
         Builder<S> builder = ImmutableTensor.builder(tensor.shape().dimensionSet());
         builder.putAll(tensor);