Version 0.1.4 - Fixing readme, Tests & Samples

Author: JavaScriptDude

README.md

@@ -104,8 +104,9 @@ option|position|dtype|description
 `key`|0|int or str|Key to access data. int for tuple or list
 `reverse`|1|bool|Reverse sort of column
 `clean`|2|func|Function / lambda to clean the value. These calls can cause a significant slowdown.
-`required`|3|bool|Default True. If false, will substitute None or default if key not found (not applicable for list or tuple rows)
-`default`|4|any|Value to substitute if required==False and key does not exist or None is found. Can be used to achive similar functionality to pandas `na_position`
+`default`|3|any|Value to substitute if required==False and key does not exist or None is found. Can be used to achive similar functionality to pandas `na_position`
+`required`|4|bool|Default True. If False, will substitute None or default if key not found (not applicable for list or tuple rows)
+
 
 \* `spec` entries can be passed as:
     type|description

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "multisort"
-version = "0.1.3"
+version = "0.1.4"
 description = "NoneType Safe Multi Column Sorting For Python"
 license = "MIT"
 authors = ["Timothy C. Quinn"]

tests/hand_test.py

@@ -8,8 +8,8 @@ def main():
     test_multisort_dict_single()
     test_multisort_obj_single()
     test_multisort_tuple_single()
-
     test_multisort_dict_multi()
+    test_multisort_dict_multi_no_mscol()
     test_multisort_obj_multi()
     test_multisort_tuple_multi()
 
@@ -55,44 +55,52 @@ def __repr__(self): return self.__str__()
 
 def test_multisort_dict_single():
     _sorted = multisort(students_dict, 'grade', reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
 def test_multisort_obj_single():
     _sorted = multisort(students_obj, 'attend', reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
 def test_multisort_tuple_single():
     _sorted = multisort(student_tuple, COL_ATTEND, reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
 def test_multisort_dict_multi():
     _sorted = multisort(students_dict, [
-             mscol('grade', reverse=True, clean=lambda s: None if s is None else s.upper(), default='0', required=True),
-            # ('attend', {'reverse': False}),
+            mscol('grade', reverse=True, clean=lambda s: None if s is None else s.upper(), default='0', required=True),
+            mscol('attend', reverse=False),
+    ], reverse=False)
+    _print_res(_sorted)
+
+
+def test_multisort_dict_multi_no_mscol():
+    _sorted = multisort(students_dict, [
+            ('grade', True, lambda s: None if s is None else s.upper(), '0', True),
+            ('attend', False),
     ], reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
 def test_multisort_obj_multi():
     _sorted = multisort(students_obj, [
             mscol('grade', reverse=True), 
             mscol('attend')
     ], reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
 def test_multisort_tuple_multi():
     _sorted = multisort(student_tuple, [
             mscol(COL_GRADE, reverse=True), 
             mscol(COL_ATTEND)
     ], reverse=False)
-    _print_stud(_sorted)
+    _print_res(_sorted)
 
 
-def _print_stud(rows):
+def _print_res(rows):
     print(f"\n{util.getFuncName(2)}() Results:")
     for row in rows:
         print(util.pre(str(row)))

tests/performance_tests.py

@@ -46,6 +46,7 @@ async def run_tests():
         run_pandas(students[:]),
         superfast(students[:]),
         superfast_clean(students[:]),
+        superfast_lambda(students[:]),
     ]
     res = await asyncio.gather(*coroutines, return_exceptions=True)
 
@@ -124,6 +125,17 @@ def key_attend(student):
     return ('superfast', sw.elapsed(prec=7))
 
 
+async def superfast_lambda(students):
+    sw = util.StopWatch()
+    students_sorted = sorted(students, key=lambda r: (r['grade'] is None, r['grade'],) )
+    students_sorted.sort(key=lambda r: (r['attend'] is None, r['attend'],), reverse=True)
+
+    return ('superfast_lambda', sw.elapsed(prec=7))
+
+
+
+
+
 async def superfast_clean(students):
     sw = util.StopWatch()
     def key_grade(student):

tests/test_multisort.py

@@ -210,8 +210,6 @@ def dump_sort(stest_no, spec, rows, rows_as, row_as, expected, reverse):
     return sb.ts()
 
 
-
-
 
 def _get_rows_in(rows_list=False, rows_tuple=False, row_as_dict=False, row_as_obj=False, row_as_list=False, row_as_tuple=False):
     if row_as_dict: