From 3bc59096bcaa74eefe4c0e8f279c584756619633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ne=C4=8Dada?= Date: Tue, 10 Sep 2019 14:04:56 +0300 Subject: [PATCH] Public beyn_result_gsl_t -> beyn_result_gsl_t convertor. Former-commit-id: 56fb70384c20b93dbc8b119c6b5b4128ce4fcaf9 --- qpms/beyn.c | 21 +++++++++++++++------ qpms/beyn.h | 6 ++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/qpms/beyn.c b/qpms/beyn.c index 9b05de7..3c3b1ed 100644 --- a/qpms/beyn.c +++ b/qpms/beyn.c @@ -444,17 +444,26 @@ int beyn_solve(beyn_result_t **result, size_t m, size_t l, beyn_function_M_t M, void *params, const beyn_contour_t *contour, double rank_tol, double res_tol) { struct beyn_function_M_carr2gsl_param p = {M, M_inv_Vhat, params}; QPMS_CRASHING_MALLOC(*result, sizeof(beyn_result_t)); - int retval = beyn_solve_gsl(&((*result)->gsl), m, l, beyn_function_M_carr2gsl, + struct beyn_result_gsl_t *result_gsl; + int retval = beyn_solve_gsl(&result_gsl, m, l, beyn_function_M_carr2gsl, (p.M_inv_Vhat_function) ? beyn_function_M_inv_Vhat_carr2gsl : NULL, (void *) &p, contour, rank_tol, res_tol); - (*result)->neig = (*result)->gsl->neig; - (*result)->eigval = (complex double *) (*result)->gsl->eigval->data; - (*result)->eigval_err = (complex double *) (*result)->gsl->eigval_err->data; - (*result)->residuals = (*result)->gsl->residuals->data; - (*result)->eigvec = (complex double *) (*result)->gsl->eigvec->data; + *result = beyn_result_from_beyn_result_gsl(result_gsl); return retval; } +beyn_result_t *beyn_result_from_beyn_result_gsl(beyn_result_gsl_t *g) { + struct beyn_result_t *result; + QPMS_CRASHING_MALLOC(result, sizeof(beyn_result_t)); + result->gsl = g; + result->neig = result->gsl->neig; + result->eigval = (complex double *) result->gsl->eigval->data; + result->eigval_err = (complex double *) result->gsl->eigval_err->data; + result->residuals = result->gsl->residuals->data; + result->eigvec = (complex double *) result->gsl->eigvec->data; + return result; +} + void beyn_result_free(beyn_result_t *result) { if(result) beyn_result_gsl_free(result->gsl); diff --git a/qpms/beyn.h b/qpms/beyn.h index df605a7..b32025e 100644 --- a/qpms/beyn.h +++ b/qpms/beyn.h @@ -61,6 +61,12 @@ typedef struct beyn_result_t { } beyn_result_t; +/// Converts beyn_result_gsl_t from beyn_result_t. +/** After calling this, use beyn_result_free() on the returned pointer; + * do NOT run beyn_result_gsl_free() anymore. + */ +beyn_result_t *beyn_result_from_beyn_result_gsl(beyn_result_gsl_t *g); + void beyn_result_free(beyn_result_t *result); int beyn_solve_gsl(beyn_result_gsl_t **result,