fixed from_series(sort_rows=False)

added test for from_series

Author: gdementen

larray/inout/array.py

@@ -82,8 +82,7 @@ def from_series(s, sort_rows=False):
     s : Pandas Series
         Input Pandas Series.
     sort_rows : bool, optional
-        Whether or not to sort the rows alphabetically (sorting is more efficient than not sorting).
-        Defaults to False.
+        Whether or not to sort the rows alphabetically. Defaults to False.
 
     Returns
     -------
@@ -92,9 +91,9 @@ def from_series(s, sort_rows=False):
     name = s.name if s.name is not None else s.index.name
     if name is not None:
         name = str(name)
-    labels = sorted(s.index.values) if sort_rows else list(s.index.values)
-    axis = Axis(labels, name)
-    return LArray(s.values, axis)
+    if sort_rows:
+        s = s.sort_index()
+    return LArray(s.values, Axis(s.index.values, name))
 
 
 def from_frame(df, sort_rows=False, sort_columns=False, parse_header=True, unfold_last_axis_name=False, **kwargs):

larray/tests/test_array.py

@@ -17,6 +17,7 @@
 from larray import (LArray, Axis, LGroup, union, zeros, zeros_like, ndrange, ndtest, ones, eye, diag, stack,
                     clip, exp, where, X, mean, isnan, round, read_hdf, read_csv, read_eurostat, read_excel,
                     from_lists, from_string, open_excel, from_frame, sequence, nan_equal)
+from larray.inout.array import from_series
 from larray.core.axis import _to_ticks, _to_key
 from larray.util.misc import StringIO
 
@@ -2680,6 +2681,17 @@ def test_from_lists(self):
                                  ['F', 'FO', 0, 0, 2]], sort_columns=True)
         assert_array_equal(sorted_arr, arr)
 
+    def test_from_series(self):
+        expected = ndtest(3)
+        s = pd.Series([0, 1, 2], index=pd.Index(['a0', 'a1', 'a2'], name='a'))
+        assert_array_equal(from_series(s), expected)
+
+        s = pd.Series([2, 0, 1], index=pd.Index(['a2', 'a0', 'a1'], name='a'))
+        assert_array_equal(from_series(s, sort_rows=True), expected)
+
+        expected = ndtest(3)[['a2', 'a0', 'a1']]
+        assert_array_equal(from_series(s), expected)
+
     def test_from_frame(self):
         # 1) data = scalar
         # ================