Add Tensor initializer with TensorSlice

Jxrgxn · Nov 20, 2015 · 0cf2303 · 0cf2303
1 parent 5ee2680
commit 0cf2303
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Source/Tensor/Tensor.swift b/Source/Tensor/Tensor.swift
@@ -48,6 +48,13 @@ public class Tensor<Element: Value> : Equatable {
         self.dimensions = tensor.dimensions
         self.elements = ValueArray<Element>(tensor.elements)
     }
+
+    public convenience init(_ tensorSlice: TensorSlice<Element>) {
+        self.init(dimensions: tensorSlice.dimensions)
+        for index in Span(zeroTo: dimensions) {
+            self[index] = tensorSlice[index]
+        }
+    }
 
     public init(_ matrix: Matrix<Element>) {
         self.dimensions = [matrix.rows, matrix.columns]
@@ -122,6 +129,11 @@ public class Tensor<Element: Value> : Equatable {
             tensorSlice[index] = newValue
         }
     }
+
+    public func reshape(dimensions: Int...) {
+        precondition(dimensions.reduce(1, combine: *) == count)
+        self.dimensions = dimensions
+    }
 
     func extractMatrix(span: Span) -> Matrix<Element> {
         assert(spanIsValid(span))