X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fmatrix-reader.c;h=02970c994ec71facf88d38dedb606671bfd15d87;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=65e3cf4d08cd59219e65fec3211ec875c841c026;hpb=a7ff3b72264244c14a6eab398681fd3efe56e9ee;p=pspp diff --git a/src/language/data-io/matrix-reader.c b/src/language/data-io/matrix-reader.c index 65e3cf4d08..02970c994e 100644 --- a/src/language/data-io/matrix-reader.c +++ b/src/language/data-io/matrix-reader.c @@ -86,8 +86,8 @@ struct matrix_reader gsl_matrix *mean_vectors; gsl_matrix *var_vectors; - gsl_matrix *correlation; - gsl_matrix *covariance; + // gsl_matrix *correlation; + // gsl_matrix *covariance; }; struct matrix_reader * @@ -251,22 +251,18 @@ next_matrix_from_reader (struct matrix_material *mm, if (mrow == -1) continue; - if (0 == strncasecmp ((char *) value_str (uv, 8), "CORR ", 8)) { - matrix_fill_row (&mr->correlation, c, mrow, vars, n_vars); + matrix_fill_row (&mm->corr, c, mrow, vars, n_vars); } else if (0 == strncasecmp ((char *) value_str (uv, 8), "COV ", 8)) { - matrix_fill_row (&mr->covariance, c, mrow, vars, n_vars); + matrix_fill_row (&mm->cov, c, mrow, vars, n_vars); } } casereader_destroy (group); - mm->cov = mr->covariance; - mm->corr = mr->correlation; - free (table); return true;