projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-enable signal emmission on row/column selection
[pspp-builds.git]
/
src
/
math
/
merge.c
diff --git
a/src/math/merge.c
b/src/math/merge.c
index b84122982e04f19fedaf1c2a0e542e58214546d0..af44855ce1cbb7718dd18d48d459fc5cfe15fa8a 100644
(file)
--- a/
src/math/merge.c
+++ b/
src/math/merge.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-36,7
+36,7
@@
struct merge_input
{
struct casereader *reader;
struct merge_input
{
struct casereader *reader;
- struct ccase c;
+ struct ccase
*
c;
};
struct merge
};
struct merge
@@
-44,18
+44,18
@@
struct merge
struct subcase ordering;
struct merge_input inputs[MAX_MERGE_ORDER];
size_t input_cnt;
struct subcase ordering;
struct merge_input inputs[MAX_MERGE_ORDER];
size_t input_cnt;
- s
ize_t value_cnt
;
+ s
truct caseproto *proto
;
};
static void do_merge (struct merge *m);
struct merge *
};
static void do_merge (struct merge *m);
struct merge *
-merge_create (const struct subcase *ordering,
size_t value_cnt
)
+merge_create (const struct subcase *ordering,
const struct caseproto *proto
)
{
struct merge *m = xmalloc (sizeof *m);
subcase_clone (&m->ordering, ordering);
m->input_cnt = 0;
{
struct merge *m = xmalloc (sizeof *m);
subcase_clone (&m->ordering, ordering);
m->input_cnt = 0;
- m->
value_cnt = value_cnt
;
+ m->
proto = caseproto_ref (proto)
;
return m;
}
return m;
}
@@
-69,6
+69,7
@@
merge_destroy (struct merge *m)
subcase_destroy (&m->ordering);
for (i = 0; i < m->input_cnt; i++)
casereader_destroy (m->inputs[i].reader);
subcase_destroy (&m->ordering);
for (i = 0; i < m->input_cnt; i++)
casereader_destroy (m->inputs[i].reader);
+ caseproto_unref (m->proto);
free (m);
}
}
free (m);
}
}
@@
-97,7
+98,7
@@
merge_make_reader (struct merge *m)
}
else if (m->input_cnt == 0)
{
}
else if (m->input_cnt == 0)
{
- struct casewriter *writer = mem_writer_create (m->
value_cnt
);
+ struct casewriter *writer = mem_writer_create (m->
proto
);
r = casewriter_make_reader (writer);
}
else
r = casewriter_make_reader (writer);
}
else
@@
-111,7
+112,8
@@
read_input_case (struct merge *m, size_t idx)
{
struct merge_input *i = &m->inputs[idx];
{
struct merge_input *i = &m->inputs[idx];
- if (casereader_read (i->reader, &i->c))
+ i->c = casereader_read (i->reader);
+ if (i->c)
return true;
else
{
return true;
else
{
@@
-130,7
+132,7
@@
do_merge (struct merge *m)
assert (m->input_cnt > 1);
assert (m->input_cnt > 1);
- w = tmpfile_writer_create (m->
value_cnt
);
+ w = tmpfile_writer_create (m->
proto
);
for (i = 0; i < m->input_cnt; i++)
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
for (i = 0; i < m->input_cnt; i++)
taint_propagate (casereader_get_taint (m->inputs[i].reader),
casewriter_get_taint (w));
@@
-144,11
+146,11
@@
do_merge (struct merge *m)
min = 0;
for (i = 1; i < m->input_cnt; i++)
min = 0;
for (i = 1; i < m->input_cnt; i++)
- if (subcase_compare_3way (&m->ordering,
&
m->inputs[i].c,
- &m->ordering,
&
m->inputs[min].c) < 0)
+ if (subcase_compare_3way (&m->ordering, m->inputs[i].c,
+ &m->ordering, m->inputs[min].c) < 0)
min = i;
min = i;
- casewriter_write (w,
&
m->inputs[min].c);
+ casewriter_write (w, m->inputs[min].c);
read_input_case (m, min);
}
read_input_case (m, min);
}