From 3778e0fd9e132cee9f506f35b8d40b16aecfe40b Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Mon, 7 Oct 2019 23:06:47 -0700 Subject: [PATCH] Update assignment --- inversions.py | 2 +- msort.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inversions.py b/inversions.py index c07e8b3..50900a3 100644 --- a/inversions.py +++ b/inversions.py @@ -34,6 +34,6 @@ def _inversions(xs): total += left + right return (count + lcount + rcount), total -def inversions(xs): +def num_inversions(xs): count, _ = _inversions(xs) return count diff --git a/msort.py b/msort.py index 48da2e4..6dd8e1c 100644 --- a/msort.py +++ b/msort.py @@ -1,9 +1,9 @@ -def msort(xs): +def mergesort(xs): if len(xs) < 2: return xs leng = len(xs) // 2 - left = msort(xs[:leng]) - right = msort(xs[leng:]) + left = mergesort(xs[:leng]) + right = mergesort(xs[leng:]) # Reversing is O(n), but so is copying, so # this does not worsen complexity.