gsl_vector_free (id->msr);
gsl_vector_free (id->eval);
gsl_matrix_free (id->evec);
- if (id->mm.cov != NULL)
- gsl_matrix_free (id->mm.cov);
- if (id->mm.corr != NULL)
- gsl_matrix_free (CONST_CAST (gsl_matrix *, id->mm.corr));
free (id);
}
}
else if (lex_match_id (lexer, "MATRIX"))
{
+ lex_match (lexer, T_EQUALS);
if (! lex_force_match_id (lexer, "IN"))
goto error;
if (!lex_force_match (lexer, T_LPAREN))
{
do_factor_by_matrix (&factor, id);
+ gsl_matrix_free (id->mm.corr);
id->mm.corr = NULL;
+ gsl_matrix_free (id->mm.cov);
id->mm.cov = NULL;
}
for (i = 0 ; i < fcm->size1; ++i)
{
for (j = 0 ; j < fcm->size2; ++j)
- tab_double (t, heading_columns + i, heading_rows +j, 0,
+ tab_double (t, heading_columns + j, heading_rows + i, 0,
gsl_matrix_get (fcm, i, j), NULL, RC_OTHER);
}
for (i = 0; i < factor->n_vars; ++i)
{
for (j = 0; j < factor->n_vars; ++j)
- tab_double (t, heading_columns + i, y + j, 0, gsl_matrix_get (idata->mm.corr, i, j), NULL, RC_OTHER);
+ tab_double (t, heading_columns + j, y + i, 0, gsl_matrix_get (idata->mm.corr, i, j), NULL, RC_OTHER);
}
}
if (i == j)
continue;
- tab_double (t, heading_columns + i, y + j, 0, significance_of_correlation (rho, w), NULL, RC_PVALUE);
+ tab_double (t, heading_columns + j, y + i, 0, significance_of_correlation (rho, w), NULL, RC_PVALUE);
}
}
}
struct tab_table *t ;
size_t i, j;
int y_pos_corr = -1;
- int y_pos_sig = -1;
int suffix_rows = 0;
const int heading_rows = 1;
for (i = 0; i < factor->n_vars; ++i)
{
for (j = 0; j < factor->n_vars; ++j)
- tab_double (t, heading_columns + i, y + j, 0, gsl_matrix_get (idata->mm.cov, i, j), NULL, RC_OTHER);
+ tab_double (t, heading_columns + j, y + i, 0, gsl_matrix_get (idata->mm.cov, i, j), NULL, RC_OTHER);
}
}
}
do_factor_by_matrix (factor, idata);
finish:
+ gsl_matrix_free (idata->mm.corr);
+ gsl_matrix_free (idata->mm.cov);
+
idata_free (idata);
casereader_destroy (r);
}