X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fmatrix-data.c;h=4370908acaa58fd8b15c97a68987707f9855cb2e;hb=176149693e28d1f1e0279f931b1d25e95742b688;hp=02673f37d20639c107717e26e7118c1e3e76b020;hpb=a9ea9305a20963994fd26debd866720c019ba0d5;p=pspp diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c index 02673f37d2..4370908aca 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/data-io/matrix-data.c @@ -182,9 +182,12 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void if (e == SYSMIS) continue; - + /* Fill in the lower triangle */ (matrices[n_splits-1])[col + mformat->n_continuous_vars * row] = e; - (matrices[n_splits-1]) [row + mformat->n_continuous_vars * col] = e; + + if (mformat->triangle != FULL) + /* Fill in the upper triangle */ + (matrices[n_splits-1]) [row + mformat->n_continuous_vars * col] = e; } row++; } @@ -269,7 +272,6 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void if (prev_case) case_copy (outcase, 0, prev_case, 0, caseproto_get_n_widths (proto)); - const struct variable *var = dict_get_var (dict, idx + 1 + row); set_varname_column (outcase, mformat->varname, var_get_name (var));