From 5583b6f358fff74f3b54878f4f8efc51127237bc Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Mon, 4 Mar 2019 15:11:05 +0900 Subject: [PATCH] gstlal.c: do not put functions in at random places - this code must be kept organized or it will degenerate into ihope --- gstlal/lib/gstlal/gstlal.c | 61 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/gstlal/lib/gstlal/gstlal.c b/gstlal/lib/gstlal/gstlal.c index 2060489408..5de920c0cf 100644 --- a/gstlal/lib/gstlal/gstlal.c +++ b/gstlal/lib/gstlal/gstlal.c @@ -550,6 +550,37 @@ gsl_matrix_ulong *gstlal_gsl_matrix_ulong_from_g_value_array(GValueArray *va) return matrix; } + +/** + * gstlal_g_value_array_from_gsl_matrix_ulong: + * @matrix: a #gsl_matrix_ulong + * + * Build a #GValueArray of #GValueArrays of #guin64 from a + * #gsl_matrix_ulong. + * + * Returns: the newly-allocated #GValueArray of newly-allocated + * #GValueArrays of #guint64s or %NULL on failure. + */ + + +GValueArray *gstlal_g_value_array_from_gsl_matrix_ulong(const gsl_matrix_ulong *matrix) +{ + GValueArray *va; + GValue v = G_VALUE_INIT; + guint i; + g_value_init(&v, G_TYPE_VALUE_ARRAY); + + va = g_value_array_new(matrix->size1); + if(!va) + return NULL; + for(i = 0; i < matrix->size1; i++) { + g_value_take_boxed(&v, gstlal_g_value_array_from_uint64s((guint64*) gsl_matrix_ulong_const_ptr(matrix, i, 0), matrix->size2)); + g_value_array_append(va, &v); + } + return va; +} + + /** * gstlal_gsl_matrix_from_g_value_array: * @va: #GValueArray of #GValueArrays of double @@ -603,36 +634,6 @@ gsl_matrix *gstlal_gsl_matrix_from_g_value_array(GValueArray *va) } -/** - * gstlal_g_value_array_from_gsl_matrix_ulong: - * @matrix: a #gsl_matrix_ulong - * - * Build a #GValueArray of #GValueArrays of #guin64 from a - * #gsl_matrix_ulong. - * - * Returns: the newly-allocated #GValueArray of newly-allocated - * #GValueArrays of #guint64s or %NULL on failure. - */ - - -GValueArray *gstlal_g_value_array_from_gsl_matrix_ulong(const gsl_matrix_ulong *matrix) -{ - GValueArray *va; - GValue v = G_VALUE_INIT; - guint i; - g_value_init(&v, G_TYPE_VALUE_ARRAY); - - va = g_value_array_new(matrix->size1); - if(!va) - return NULL; - for(i = 0; i < matrix->size1; i++) { - g_value_take_boxed(&v, gstlal_g_value_array_from_uint64s((guint64*) gsl_matrix_ulong_const_ptr(matrix, i, 0), matrix->size2)); - g_value_array_append(va, &v); - } - return va; -} - - /** * gstlal_g_value_array_from_gsl_matrix: * @matrix: a #gsl_matrix -- GitLab