Updaed code review comments

Author: rahulr-NI

generated/nifake/nifake/_grpc_stub_interpreter.py

@@ -489,13 +489,13 @@ def write_waveform(self, waveform):  # noqa: N802
     def write_waveform_numpy(self, waveform):  # noqa: N802
         raise NotImplementedError('numpy-specific methods are not supported over gRPC')
 
-    def write_waveform_complex_f32(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex128(self, waveform_data_array):  # noqa: N802
         raise NotImplementedError('numpy-specific methods are not supported over gRPC')
 
-    def write_waveform_complex_f64(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex64(self, waveform_data_array):  # noqa: N802
         raise NotImplementedError('numpy-specific methods are not supported over gRPC')
 
-    def write_waveform_numpy_complex_i16(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex_interleaved_i16(self, waveform_data_array):  # noqa: N802
         raise NotImplementedError('numpy-specific methods are not supported over gRPC')
 
     def close(self):  # noqa: N802

generated/nifake/nifake/_library.py

@@ -93,9 +93,9 @@ def __init__(self, ctypes_library):
         self.niFake_UnlockSession_cfunc = None
         self.niFake_Use64BitNumber_cfunc = None
         self.niFake_WriteWaveform_cfunc = None
-        self.niFake_WriteWaveformComplexF32_cfunc = None
-        self.niFake_WriteWaveformComplexF64_cfunc = None
-        self.niFake_WriteWaveformNumpyComplexI16_cfunc = None
+        self.niFake_WriteWaveformNumpyComplex128_cfunc = None
+        self.niFake_WriteWaveformNumpyComplex64_cfunc = None
+        self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc = None
         self.niFake_close_cfunc = None
         self.niFake_error_message_cfunc = None
         self.niFake_self_test_cfunc = None
@@ -643,29 +643,29 @@ def niFake_WriteWaveform(self, vi, number_of_samples, waveform):  # noqa: N802
                 self.niFake_WriteWaveform_cfunc.restype = ViStatus  # noqa: F405
         return self.niFake_WriteWaveform_cfunc(vi, number_of_samples, waveform)
 
-    def niFake_WriteWaveformComplexF32(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+    def niFake_WriteWaveformNumpyComplex128(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
         with self._func_lock:
-            if self.niFake_WriteWaveformComplexF32_cfunc is None:
-                self.niFake_WriteWaveformComplexF32_cfunc = self._get_library_function('niFake_WriteWaveformComplexF32')
-                self.niFake_WriteWaveformComplexF32_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexNumberF32)]  # noqa: F405
-                self.niFake_WriteWaveformComplexF32_cfunc.restype = ViStatus  # noqa: F405
-        return self.niFake_WriteWaveformComplexF32_cfunc(vi, number_of_samples, waveform_data_array)
+            if self.niFake_WriteWaveformNumpyComplex128_cfunc is None:
+                self.niFake_WriteWaveformNumpyComplex128_cfunc = self._get_library_function('niFake_WriteWaveformNumpyComplex128')
+                self.niFake_WriteWaveformNumpyComplex128_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexNumber)]  # noqa: F405
+                self.niFake_WriteWaveformNumpyComplex128_cfunc.restype = ViStatus  # noqa: F405
+        return self.niFake_WriteWaveformNumpyComplex128_cfunc(vi, number_of_samples, waveform_data_array)
 
-    def niFake_WriteWaveformComplexF64(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+    def niFake_WriteWaveformNumpyComplex64(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
         with self._func_lock:
-            if self.niFake_WriteWaveformComplexF64_cfunc is None:
-                self.niFake_WriteWaveformComplexF64_cfunc = self._get_library_function('niFake_WriteWaveformComplexF64')
-                self.niFake_WriteWaveformComplexF64_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexNumber)]  # noqa: F405
-                self.niFake_WriteWaveformComplexF64_cfunc.restype = ViStatus  # noqa: F405
-        return self.niFake_WriteWaveformComplexF64_cfunc(vi, number_of_samples, waveform_data_array)
+            if self.niFake_WriteWaveformNumpyComplex64_cfunc is None:
+                self.niFake_WriteWaveformNumpyComplex64_cfunc = self._get_library_function('niFake_WriteWaveformNumpyComplex64')
+                self.niFake_WriteWaveformNumpyComplex64_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexNumberF32)]  # noqa: F405
+                self.niFake_WriteWaveformNumpyComplex64_cfunc.restype = ViStatus  # noqa: F405
+        return self.niFake_WriteWaveformNumpyComplex64_cfunc(vi, number_of_samples, waveform_data_array)
 
-    def niFake_WriteWaveformNumpyComplexI16(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+    def niFake_WriteWaveformNumpyComplexInterleavedI16(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
         with self._func_lock:
-            if self.niFake_WriteWaveformNumpyComplexI16_cfunc is None:
-                self.niFake_WriteWaveformNumpyComplexI16_cfunc = self._get_library_function('niFake_WriteWaveformNumpyComplexI16')
-                self.niFake_WriteWaveformNumpyComplexI16_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexI16)]  # noqa: F405
-                self.niFake_WriteWaveformNumpyComplexI16_cfunc.restype = ViStatus  # noqa: F405
-        return self.niFake_WriteWaveformNumpyComplexI16_cfunc(vi, number_of_samples, waveform_data_array)
+            if self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc is None:
+                self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc = self._get_library_function('niFake_WriteWaveformNumpyComplexInterleavedI16')
+                self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(NIComplexI16)]  # noqa: F405
+                self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc.restype = ViStatus  # noqa: F405
+        return self.niFake_WriteWaveformNumpyComplexInterleavedI16_cfunc(vi, number_of_samples, waveform_data_array)
 
     def niFake_close(self, vi):  # noqa: N802
         with self._func_lock:

generated/nifake/nifake/_library_interpreter.py

@@ -738,27 +738,27 @@ def write_waveform_numpy(self, waveform):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 
-    def write_waveform_complex_f32(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex128(self, waveform_data_array):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         number_of_samples_ctype = _visatype.ViInt32(0 if waveform_data_array is None else len(waveform_data_array))  # case S160
-        waveform_data_array_ctype = _get_ctypes_pointer_for_buffer(value=waveform_data_array, library_type=_complextype.NIComplexNumberF32)  # case B510
-        error_code = self._library.niFake_WriteWaveformComplexF32(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
+        waveform_data_array_ctype = _get_ctypes_pointer_for_buffer(value=waveform_data_array, library_type=_complextype.NIComplexNumber)  # case B510
+        error_code = self._library.niFake_WriteWaveformNumpyComplex128(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 
-    def write_waveform_complex_f64(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex64(self, waveform_data_array):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         number_of_samples_ctype = _visatype.ViInt32(0 if waveform_data_array is None else len(waveform_data_array))  # case S160
-        waveform_data_array_ctype = _get_ctypes_pointer_for_buffer(value=waveform_data_array, library_type=_complextype.NIComplexNumber)  # case B510
-        error_code = self._library.niFake_WriteWaveformComplexF64(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
+        waveform_data_array_ctype = _get_ctypes_pointer_for_buffer(value=waveform_data_array, library_type=_complextype.NIComplexNumberF32)  # case B510
+        error_code = self._library.niFake_WriteWaveformNumpyComplex64(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 
-    def write_waveform_numpy_complex_i16(self, waveform_data_array):  # noqa: N802
+    def write_waveform_numpy_complex_interleaved_i16(self, waveform_data_array):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         number_of_samples_ctype = _visatype.ViInt32(0 if waveform_data_array is None else len(waveform_data_array) // 2)  # case S160
         waveform_data_array_ctype = _get_ctypes_pointer_for_buffer(value=waveform_data_array, library_type=_complextype.NIComplexI16)  # case B510
-        error_code = self._library.niFake_WriteWaveformNumpyComplexI16(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
+        error_code = self._library.niFake_WriteWaveformNumpyComplexInterleavedI16(vi_ctype, number_of_samples_ctype, waveform_data_array_ctype)
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 

generated/nifake/nifake/session.py

@@ -1671,13 +1671,13 @@ def write_waveform_numpy(self, waveform):
         self._interpreter.write_waveform_numpy(waveform)
 
     @ivi_synchronized
-    def write_waveform_complex_f32(self, waveform_data_array):
-        r'''write_waveform_complex_f32
+    def write_waveform_numpy_complex128(self, waveform_data_array):
+        r'''write_waveform_numpy_complex128
 
-        A method that writes a waveform of numpy complex64 numbers.
+        A method that writes a waveform of numpy complex128 numbers
 
         Args:
-            waveform_data_array (numpy.array(dtype=numpy.complex64)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
+            waveform_data_array (numpy.array(dtype=numpy.complex128)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
 
         '''
         import numpy
@@ -1686,18 +1686,18 @@ def write_waveform_complex_f32(self, waveform_data_array):
             raise TypeError('waveform_data_array must be {0}, is {1}'.format(numpy.ndarray, type(waveform_data_array)))
         if numpy.isfortran(waveform_data_array) is True:
             raise TypeError('waveform_data_array must be in C-order')
-        if waveform_data_array.dtype is not numpy.dtype('complex64'):
-            raise TypeError('waveform_data_array must be numpy.ndarray of dtype=complex64, is ' + str(waveform_data_array.dtype))
-        self._interpreter.write_waveform_complex_f32(waveform_data_array)
+        if waveform_data_array.dtype is not numpy.dtype('complex128'):
+            raise TypeError('waveform_data_array must be numpy.ndarray of dtype=complex128, is ' + str(waveform_data_array.dtype))
+        self._interpreter.write_waveform_numpy_complex128(waveform_data_array)
 
     @ivi_synchronized
-    def write_waveform_complex_f64(self, waveform_data_array):
-        r'''write_waveform_complex_f64
+    def write_waveform_numpy_complex64(self, waveform_data_array):
+        r'''write_waveform_numpy_complex64
 
-        A method that writes a waveform of numpy complex128 numbers
+        A method that writes a waveform of numpy complex64 numbers.
 
         Args:
-            waveform_data_array (numpy.array(dtype=numpy.complex128)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
+            waveform_data_array (numpy.array(dtype=numpy.complex64)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
 
         '''
         import numpy
@@ -1706,13 +1706,13 @@ def write_waveform_complex_f64(self, waveform_data_array):
             raise TypeError('waveform_data_array must be {0}, is {1}'.format(numpy.ndarray, type(waveform_data_array)))
         if numpy.isfortran(waveform_data_array) is True:
             raise TypeError('waveform_data_array must be in C-order')
-        if waveform_data_array.dtype is not numpy.dtype('complex128'):
-            raise TypeError('waveform_data_array must be numpy.ndarray of dtype=complex128, is ' + str(waveform_data_array.dtype))
-        self._interpreter.write_waveform_complex_f64(waveform_data_array)
+        if waveform_data_array.dtype is not numpy.dtype('complex64'):
+            raise TypeError('waveform_data_array must be numpy.ndarray of dtype=complex64, is ' + str(waveform_data_array.dtype))
+        self._interpreter.write_waveform_numpy_complex64(waveform_data_array)
 
     @ivi_synchronized
-    def write_waveform_numpy_complex_i16(self, waveform_data_array):
-        r'''write_waveform_numpy_complex_i16
+    def write_waveform_numpy_complex_interleaved_i16(self, waveform_data_array):
+        r'''write_waveform_numpy_complex_interleaved_i16
 
         A method that writes a waveform of numpy complex i16 numbers.
 
@@ -1728,7 +1728,7 @@ def write_waveform_numpy_complex_i16(self, waveform_data_array):
             raise TypeError('waveform_data_array must be in C-order')
         if waveform_data_array.dtype is not numpy.dtype('int16'):
             raise TypeError('waveform_data_array must be numpy.ndarray of dtype=int16, is ' + str(waveform_data_array.dtype))
-        self._interpreter.write_waveform_numpy_complex_i16(waveform_data_array)
+        self._interpreter.write_waveform_numpy_complex_interleaved_i16(waveform_data_array)
 
     def _close(self):
         r'''_close

generated/nifake/nifake/unit_tests/_mock_helper.py

@@ -210,12 +210,12 @@ def __init__(self):
         self._defaults['Use64BitNumber']['output'] = None
         self._defaults['WriteWaveform'] = {}
         self._defaults['WriteWaveform']['return'] = 0
-        self._defaults['WriteWaveformComplexF32'] = {}
-        self._defaults['WriteWaveformComplexF32']['return'] = 0
-        self._defaults['WriteWaveformComplexF64'] = {}
-        self._defaults['WriteWaveformComplexF64']['return'] = 0
-        self._defaults['WriteWaveformNumpyComplexI16'] = {}
-        self._defaults['WriteWaveformNumpyComplexI16']['return'] = 0
+        self._defaults['WriteWaveformNumpyComplex128'] = {}
+        self._defaults['WriteWaveformNumpyComplex128']['return'] = 0
+        self._defaults['WriteWaveformNumpyComplex64'] = {}
+        self._defaults['WriteWaveformNumpyComplex64']['return'] = 0
+        self._defaults['WriteWaveformNumpyComplexInterleavedI16'] = {}
+        self._defaults['WriteWaveformNumpyComplexInterleavedI16']['return'] = 0
         self._defaults['close'] = {}
         self._defaults['close']['return'] = 0
         self._defaults['error_message'] = {}
@@ -961,20 +961,20 @@ def niFake_WriteWaveform(self, vi, number_of_samples, waveform):  # noqa: N802
             return self._defaults['WriteWaveform']['return']
         return self._defaults['WriteWaveform']['return']
 
-    def niFake_WriteWaveformComplexF32(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
-        if self._defaults['WriteWaveformComplexF32']['return'] != 0:
-            return self._defaults['WriteWaveformComplexF32']['return']
-        return self._defaults['WriteWaveformComplexF32']['return']
+    def niFake_WriteWaveformNumpyComplex128(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+        if self._defaults['WriteWaveformNumpyComplex128']['return'] != 0:
+            return self._defaults['WriteWaveformNumpyComplex128']['return']
+        return self._defaults['WriteWaveformNumpyComplex128']['return']
 
-    def niFake_WriteWaveformComplexF64(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
-        if self._defaults['WriteWaveformComplexF64']['return'] != 0:
-            return self._defaults['WriteWaveformComplexF64']['return']
-        return self._defaults['WriteWaveformComplexF64']['return']
+    def niFake_WriteWaveformNumpyComplex64(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+        if self._defaults['WriteWaveformNumpyComplex64']['return'] != 0:
+            return self._defaults['WriteWaveformNumpyComplex64']['return']
+        return self._defaults['WriteWaveformNumpyComplex64']['return']
 
-    def niFake_WriteWaveformNumpyComplexI16(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
-        if self._defaults['WriteWaveformNumpyComplexI16']['return'] != 0:
-            return self._defaults['WriteWaveformNumpyComplexI16']['return']
-        return self._defaults['WriteWaveformNumpyComplexI16']['return']
+    def niFake_WriteWaveformNumpyComplexInterleavedI16(self, vi, number_of_samples, waveform_data_array):  # noqa: N802
+        if self._defaults['WriteWaveformNumpyComplexInterleavedI16']['return'] != 0:
+            return self._defaults['WriteWaveformNumpyComplexInterleavedI16']['return']
+        return self._defaults['WriteWaveformNumpyComplexInterleavedI16']['return']
 
     def niFake_close(self, vi):  # noqa: N802
         if self._defaults['close']['return'] != 0:
@@ -1150,12 +1150,12 @@ def set_side_effects_and_return_values(self, mock_library):
         mock_library.niFake_Use64BitNumber.return_value = 0
         mock_library.niFake_WriteWaveform.side_effect = MockFunctionCallError("niFake_WriteWaveform")
         mock_library.niFake_WriteWaveform.return_value = 0
-        mock_library.niFake_WriteWaveformComplexF32.side_effect = MockFunctionCallError("niFake_WriteWaveformComplexF32")
-        mock_library.niFake_WriteWaveformComplexF32.return_value = 0
-        mock_library.niFake_WriteWaveformComplexF64.side_effect = MockFunctionCallError("niFake_WriteWaveformComplexF64")
-        mock_library.niFake_WriteWaveformComplexF64.return_value = 0
-        mock_library.niFake_WriteWaveformNumpyComplexI16.side_effect = MockFunctionCallError("niFake_WriteWaveformNumpyComplexI16")
-        mock_library.niFake_WriteWaveformNumpyComplexI16.return_value = 0
+        mock_library.niFake_WriteWaveformNumpyComplex128.side_effect = MockFunctionCallError("niFake_WriteWaveformNumpyComplex128")
+        mock_library.niFake_WriteWaveformNumpyComplex128.return_value = 0
+        mock_library.niFake_WriteWaveformNumpyComplex64.side_effect = MockFunctionCallError("niFake_WriteWaveformNumpyComplex64")
+        mock_library.niFake_WriteWaveformNumpyComplex64.return_value = 0
+        mock_library.niFake_WriteWaveformNumpyComplexInterleavedI16.side_effect = MockFunctionCallError("niFake_WriteWaveformNumpyComplexInterleavedI16")
+        mock_library.niFake_WriteWaveformNumpyComplexInterleavedI16.return_value = 0
         mock_library.niFake_close.side_effect = MockFunctionCallError("niFake_close")
         mock_library.niFake_close.return_value = 0
         mock_library.niFake_error_message.side_effect = MockFunctionCallError("niFake_error_message")