[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/sort.c
From: |
John Darrington |
Subject: |
[Pspp-cvs] Changes to pspp/src/sort.c |
Date: |
Thu, 06 Jan 2005 08:24:12 -0500 |
Index: pspp/src/sort.c
diff -u pspp/src/sort.c:1.21 pspp/src/sort.c:1.22
--- pspp/src/sort.c:1.21 Thu Jan 6 05:29:46 2005
+++ pspp/src/sort.c Thu Jan 6 12:55:44 2005
@@ -752,7 +752,9 @@
make_heap (xsrt->initial_runs, xsrt->run_cnt, sizeof *xsrt->initial_runs,
compare_initial_runs, NULL);
dummy_run_cnt = mod (1 - (int) xsrt->run_cnt, max_order - 1);
- assert (max_order == 2
+
+ assert( max_order > 0 );
+ assert (max_order <= 2
|| (xsrt->run_cnt + dummy_run_cnt) % (max_order - 1) == 1);
while (xsrt->run_cnt > 1)
{