fix: add support for complex numbers and provided ndarrays having arbitrary rank

kgryte · kgryte · commit 267e16e021c8 · 2023-10-13T17:46:19.000-07:00
diff --git a/lib/node_modules/@stdlib/ndarray/array/lib/copy_view.js b/lib/node_modules/@stdlib/ndarray/array/lib/copy_view.js
@@ -20,8 +20,18 @@
 
 // MODULES //
 
+var arraylike2object = require( '@stdlib/array/base/arraylike2object' );
+var castReturn = require( '@stdlib/complex/base/cast-return' );
+var complexCtors = require( '@stdlib/complex/ctors' );
 var bufferCtors = require( '@stdlib/ndarray/base/buffer-ctors' );
 var allocUnsafe = require( '@stdlib/buffer/alloc-unsafe' );
+var ndarray = require( '@stdlib/ndarray/base/ctor' );
+var getDType = require( '@stdlib/ndarray/dtype' );
+var getShape = require( '@stdlib/ndarray/shape' );
+var getStrides = require( '@stdlib/ndarray/strides' );
+var getOffset = require( '@stdlib/ndarray/offset' );
+var getOrder = require( '@stdlib/ndarray/order' );
+var getData = require( '@stdlib/ndarray/data-buffer' );
 
 
 // FUNCTIONS //
@@ -41,7 +51,7 @@ function generic( arr ) {
 	len = arr.length;
 	out = [];
 	for ( i = 0; i < len; i++ ) {
-		out.push( arr.get( i ) ); // FIXME: what if `arr` has more than one dimensions?
+		out.push( arr.iget( i ) ); // as output buffer is generic, should work with both real- and complex-valued ndarrays
 	}
 	return out;
 }
@@ -61,7 +71,7 @@ function binary( arr ) {
 	len = arr.length;
 	out = allocUnsafe( len );
 	for ( i = 0; i < len; i++ ) {
-		out[ i ] = arr.get( i ); // FIXME: what if `arr` has more than one dimensions?
+		out[ i ] = arr.iget( i ); // we're assuming that we're doing something sensible here (e.g., not trying to cast a complex-valued ndarray to a "binary" ndarray or a double-precision floating-point ndarray to binary, etc)
 	}
 	return out;
 }
@@ -78,15 +88,40 @@ function typed( arr, dtype ) {
 	var ctor;
 	var len;
 	var out;
+	var set;
+	var fcn;
+	var o;
 	var i;
 
 	ctor = bufferCtors( dtype );
 	len = arr.length;
-	out = new ctor( len ); // FIXME: need to account for complex number arrays; in which case, we may want to do something similar to `array/convert`
-	for ( i = 0; i < len; i++ ) {
-		out[ i ] = arr.get( i ); // FIXME: what if `arr` has more than one dimensions?
+	out = new ctor( len );
+
+	// If the output data buffer is a complex number array, we need to use accessors...
+	o = arraylike2object( out );
+	if ( o.accessorProtocol ) {
+		set = o.accessors[ 1 ];
+		fcn = castReturn( wrapper, 1, complexCtors( dtype ) );
+		for ( i = 0; i < len; i++ ) {
+			set( out, i, fcn( i ) ); // we're assuming that we're doing something sensible here (e.g., not trying to cast arbitrary objects to complex numbers, etc)
+		}
+	} else {
+		for ( i = 0; i < len; i++ ) {
+			out[ i ] = arr.iget( i ); // we're assuming that we're doing something sensible here (e.g., not trying to cast an ndarray containing generic objects to a double-precision floating-point array or a complex-valued ndarray to a real-valued ndarray, etc)
+		}
 	}
 	return out;
+
+	/**
+	* Returns the ndarray element specified by a provided linear index.
+	*
+	* @private
+	* @param {NonNegativeInteger} i - linear index
+	* @returns {*} value
+	*/
+	function wrapper( i ) {
+		return arr.iget( i );
+	}
 }
 
 
@@ -112,14 +147,18 @@ function typed( arr, dtype ) {
 * // returns <Float64Array>[ 3.0, 2.0, 1.0 ]
 */
 function copyView( arr, dtype ) {
-	// TODO: handle complex number dtypes!!
+	var x;
+
+	// Create a new "base" view, thus ensuring we have an `.iget` method and associated meta data...
+	x = new ndarray( getDType( arr ), getData( arr ), getShape( arr ), getStrides( arr ), getOffset( arr ), getOrder( arr ) ); // eslint-disable-line max-len
+
 	if ( dtype === 'generic') {
-		return generic( arr );
+		return generic( x );
 	}
 	if ( dtype === 'binary' ) {
-		return binary( arr );
+		return binary( x );
 	}
-	return typed( arr, dtype );
+	return typed( x, dtype );
 }
 
 
