/[pspp]/pspp/src/sort.c
ViewVC logotype

Diff of /pspp/src/sort.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by blp, Tue Jun 1 04:57:29 2004 UTC revision 1.21 by blp, Thu Jan 6 05:29:46 2005 UTC
# Line 752  merge (struct external_sort *xsrt) Line 752  merge (struct external_sort *xsrt)
752    make_heap (xsrt->initial_runs, xsrt->run_cnt, sizeof *xsrt->initial_runs,    make_heap (xsrt->initial_runs, xsrt->run_cnt, sizeof *xsrt->initial_runs,
753               compare_initial_runs, NULL);               compare_initial_runs, NULL);
754    dummy_run_cnt = mod (1 - (int) xsrt->run_cnt, max_order - 1);    dummy_run_cnt = mod (1 - (int) xsrt->run_cnt, max_order - 1);
755    assert (max_order == 1    assert (max_order == 2
756            || (xsrt->run_cnt + dummy_run_cnt) % (max_order - 1) == 1);            || (xsrt->run_cnt + dummy_run_cnt) % (max_order - 1) == 1);
757    while (xsrt->run_cnt > 1)    while (xsrt->run_cnt > 1)
758      {      {

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26