array-kit 0.2.11 → 0.2.12

package/lib/NDArray.js

@@ -86,6 +86,9 @@ function NDArray( dataOrConstructor , sizes , params ) {
 	// Define the layout of the array in memory, strides are products of all faster dimensions
 	this.strides = new Array( dimensions ) ;
 
+	// Use to speed up the whole array iteration
+	this.backStrides = new Array( dimensions ) ;
+
 	// This is the index of the first logical element in the physical data storage
 	this.offset = 0 ;
 
@@ -203,6 +206,7 @@ NDArray.prototype._initMinsMaxsFromSizes = function( sizes ) {
 NDArray.prototype._initStridesUsingSizes = function( stride = 1 ) {
 	for ( const d of this.order ) {
 		this.strides[ d ] = stride ;
+		this.backStrides[ d ] = ( 1 - this.sizes[ d ] ) * stride ;
 		stride *= this.sizes[ d ] ;
 	}
 } ;
@@ -283,6 +287,7 @@ NDArray.prototype.flip = function( dimension ) {
 	}
 
 	this.strides[ dimension ] *= - 1 ;
+	this.backStrides[ dimension ] *= - 1 ;
 	this._initOffsetEndFromStartSizesStrides() ;
 
 	return this ;
@@ -290,7 +295,11 @@ NDArray.prototype.flip = function( dimension ) {
 
 // Flip coordinates along all dimensions at once, but preserving min and max
 NDArray.prototype.flipAll = function() {
-	for ( let d = 0 ; d < this.dimensions ; d ++ ) { this.strides[ d ] *= - 1 ; }
+	for ( let d = 0 ; d < this.dimensions ; d ++ ) {
+		this.strides[ d ] *= - 1 ;
+		this.backStrides[ d ] *= - 1 ;
+	}
+
 	this._initOffsetEndFromStartSizesStrides() ;
 	return this ;
 } ;
@@ -309,6 +318,7 @@ NDArray.prototype._cloneGeometry = function() {
 	Object.assign( newNDArray.mins , this.mins ) ;
 	Object.assign( newNDArray.maxs , this.maxs ) ;
 	Object.assign( newNDArray.strides , this.strides ) ;
+	Object.assign( newNDArray.backStrides , this.backStrides ) ;
 
 	// Start at index=0 in the physical storage
 	newNDArray.offset = this.offset - this.dataStart ;
@@ -350,7 +360,6 @@ NDArray.prototype._newStorageOfTheSameKind = function( size = this.dataEnd - thi
 // index = coords[ 0 ] * strides[ 0 ] + coords[ 1 ] * strides[ 1 ] + ... + coords[ n ] * strides[ n ]
 NDArray.prototype._getIndex = function( coords ) {
 	let index = this.offset ;
-	//for ( const d of this.order ) { index += ( coords[ d ] - this.mins[ d ] ) * this.strides[ d ] ; }
 	for ( let d = 0 ; d < this.dimensions ; d ++ ) { index += ( coords[ d ] - this.mins[ d ] ) * this.strides[ d ] ; }
 	return index ;
 } ;
@@ -537,31 +546,7 @@ NDArray.prototype._getStrideStartAndVectorDimension = function( coords ) {
 */
 NDArray.prototype.forEach =
 NDArray.prototype._forEach = function( callback ) {
-	// Usually =1, but later we could group neighbours (e.g. for RGBA images => stride0 = 4)
-	const stride0 = this.strides[ this.order[ 0 ] ] ;
-	const coords = Array.from( this.mins ) ;
-	let index = this.dataStart ;
-
-	for ( ;; ) {
-		callback( this.data[ index ] , coords , index , this ) ;
-
-		index += stride0 ;
-		if ( index >= this.dataEnd ) { return ; }
-
-		for ( let i = 0 ; i < this.dimensions ; i ++ ) {
-			const d = this.order[ i ] ;
-			coords[ d ] ++ ;
-			if (
-				i < this.dimensions - 1
-				&& coords[ d ] - this.mins[ d ] >= this.strides[ this.order[ i + 1 ] ]
-			) {
-				coords[ d ] = this.mins[ d ] ;
-			}
-			else {
-				break ;
-			}
-		}
-	}
+	return this._forEachInRegion( this.mins , this.maxs , callback , true ) ;
 } ;
 
 
@@ -597,10 +582,19 @@ NDArray.prototype._forEachInRegionCheck = function( mins , maxs , callback ) {
 	this._forEachInRegion( mins , maxs , callback ) ;
 } ;
 
-NDArray.prototype._forEachInRegion = function( mins , maxs , callback ) {
-	const backStrides = mins.map( ( min , d ) => ( min - maxs[ d ] ) * this.strides[ d ] ) ;
+// wholeArray=true when coming from ._forEach()
+NDArray.prototype._forEachInRegion = function( mins , maxs , callback , wholeArray = false ) {
+	let backStrides , index ;
 	const coords = Array.from( mins ) ;
-	let index = this._getIndex( coords ) ;
+
+	if ( wholeArray ) {
+		backStrides = this.backStrides ;
+		index = this.offset ;
+	}
+	else {
+		backStrides = mins.map( ( min , d ) => ( min - maxs[ d ] ) * this.strides[ d ] ) ;
+		index = this._getIndex( coords ) ;
+	}
 
 	for ( ;; ) {
 		callback( this.data[ index ] , coords , index , this ) ;
@@ -677,6 +671,13 @@ NDArray.prototype._forEachVectorInRegion = function( strideStartCoords , maxs ,
 
 
 
+// Return a Generator
+// .each()
+NDArray.prototype.each =
+NDArray.prototype._each = function() {
+	return this._eachInRegion( this.mins , this.maxs , true ) ;
+} ;
+
 // Return a Generator
 // .eachInRegion( region )
 // .eachInRegion( mins , maxs )
@@ -696,10 +697,20 @@ NDArray.prototype._eachInRegionCheck = function( mins , maxs ) {
 
 // Generator
 // The yielded entry { coords , index , value } should be cloned, as well as entry.coords, if userland want to modify it
-NDArray.prototype._eachInRegion = function*( mins , maxs ) {
-	const backStrides = mins.map( ( min , d ) => ( min - maxs[ d ] ) * this.strides[ d ] ) ;
+// wholeArray=true when coming from ._each()
+NDArray.prototype._eachInRegion = function*( mins , maxs , wholeArray = false ) {
+	let backStrides , index ;
 	const coords = Array.from( mins ) ;
-	let index = this._getIndex( coords ) ;
+
+	if ( wholeArray ) {
+		backStrides = this.backStrides ;
+		index = this.offset ;
+	}
+	else {
+		backStrides = mins.map( ( min , d ) => ( min - maxs[ d ] ) * this.strides[ d ] ) ;
+		index = this._getIndex( coords ) ;
+	}
+
 	const entry = { coords , index , value: undefined } ;
 
 	for ( ;; ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "array-kit",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "An array manipulation toolbox.",
   "main": "lib/array-kit.js",
   "directories": {