Skip to content

Commit efe35ec

Browse files
committed
Just use numpy.asarray to convert a vector to numpy array
Because running np.asarray on a pandas.Series returns a numpy.ndarray anyway.
1 parent 6d804d7 commit efe35ec

File tree

1 file changed

+1
-43
lines changed

1 file changed

+1
-43
lines changed

pygmt/clib/conversion.py

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def vectors_to_arrays(vectors):
156156
True
157157
158158
"""
159-
arrays = [as_c_contiguous(_as_array(i)) for i in vectors]
159+
arrays = [as_c_contiguous(np.asarray(i)) for i in vectors]
160160
return arrays
161161

162162

@@ -203,48 +203,6 @@ def as_c_contiguous(array):
203203
return array
204204

205205

206-
def _as_array(vector):
207-
"""
208-
Convert a vector (pandas.Series, tuple, list or numpy array) to a numpy
209-
array.
210-
211-
If vector is already an array, do nothing.
212-
213-
Parameters
214-
----------
215-
vector : tuple, list, pandas.Series or numpy 1d array
216-
The vector to convert.
217-
218-
Returns
219-
-------
220-
array : numpy array
221-
222-
Examples
223-
--------
224-
225-
>>> import pandas as pd
226-
>>> x_series = pd.Series(data=[1, 2, 3, 4])
227-
>>> x_array = _as_array(x_series)
228-
>>> type(x_array)
229-
<class 'numpy.ndarray'>
230-
>>> x_array
231-
array([1, 2, 3, 4])
232-
>>> import numpy as np
233-
>>> type(_as_array(np.array([5, 6, 7])))
234-
<class 'numpy.ndarray'>
235-
>>> type(_as_array([3, 4, 5]))
236-
<class 'numpy.ndarray'>
237-
>>> type(_as_array((6, 7, 8)))
238-
<class 'numpy.ndarray'>
239-
>>> type(_as_array(range(15)))
240-
<class 'numpy.ndarray'>
241-
242-
"""
243-
if isinstance(vector, pandas.Series):
244-
return vector.to_numpy()
245-
return np.asarray(vector)
246-
247-
248206
def kwargs_to_ctypes_array(argument, kwargs, dtype):
249207
"""
250208
Convert an iterable argument from kwargs into a ctypes array variable.

0 commit comments

Comments
 (0)