From: Matthew Fernandez Date: Thu, 1 Jul 2021 01:57:37 +0000 (-0700) Subject: remove configurability from SparseMatrix_from_coordinate_arrays_not_compacted X-Git-Tag: 2.48.0~11^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6e906ec3742d35dcd9b85337c642abb03cb6852;p=graphviz remove configurability from SparseMatrix_from_coordinate_arrays_not_compacted This function is only ever called with SUM_REPEATED_NONE. --- diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c index 65b404f23..50bac4e4b 100644 --- a/lib/sparse/SparseMatrix.c +++ b/lib/sparse/SparseMatrix.c @@ -726,7 +726,7 @@ SparseMatrix SparseMatrix_from_coordinate_format_not_compacted(SparseMatrix A){ } irn = A->ia; jcn = A->ja; - return SparseMatrix_from_coordinate_arrays_not_compacted(A->nz, A->m, A->n, irn, jcn, a, A->type, A->size, SUM_REPEATED_NONE); + return SparseMatrix_from_coordinate_arrays_not_compacted(A->nz, A->m, A->n, irn, jcn, a, A->type, A->size); } static SparseMatrix SparseMatrix_from_coordinate_arrays_internal(int nz, int m, int n, int *irn, int *jcn, void *val0, int type, size_t sz, int sum_repeated){ @@ -863,8 +863,8 @@ SparseMatrix SparseMatrix_from_coordinate_arrays(int nz, int m, int n, int *irn, } -SparseMatrix SparseMatrix_from_coordinate_arrays_not_compacted(int nz, int m, int n, int *irn, int *jcn, void *val0, int type, size_t sz, int what_to_sum){ - return SparseMatrix_from_coordinate_arrays_internal(nz, m, n, irn, jcn, val0, type, sz, what_to_sum); +SparseMatrix SparseMatrix_from_coordinate_arrays_not_compacted(int nz, int m, int n, int *irn, int *jcn, void *val0, int type, size_t sz){ + return SparseMatrix_from_coordinate_arrays_internal(nz, m, n, irn, jcn, val0, type, sz, SUM_REPEATED_NONE); } SparseMatrix SparseMatrix_add(SparseMatrix A, SparseMatrix B){ diff --git a/lib/sparse/SparseMatrix.h b/lib/sparse/SparseMatrix.h index c24c07bf8..821cdd2c9 100644 --- a/lib/sparse/SparseMatrix.h +++ b/lib/sparse/SparseMatrix.h @@ -48,8 +48,7 @@ SparseMatrix SparseMatrix_from_coordinate_format(SparseMatrix A); SparseMatrix SparseMatrix_from_coordinate_format_not_compacted(SparseMatrix A); SparseMatrix SparseMatrix_from_coordinate_arrays(int nz, int m, int n, int *irn, int *jcn, void *val, int type, size_t sz); -/* what_to_sum is SUM_REPEATED_NONE, SUM_REPEATED_ALL, SUM_REPEATED_REAL_PART, SUM_REPEATED_IMAGINARY_PART, SUM_IMGINARY_KEEP_LAST_REAL*/ -SparseMatrix SparseMatrix_from_coordinate_arrays_not_compacted(int nz, int m, int n, int *irn, int *jcn, void *val, int type, size_t sz, int what_to_sum); +SparseMatrix SparseMatrix_from_coordinate_arrays_not_compacted(int nz, int m, int n, int *irn, int *jcn, void *val, int type, size_t sz); void SparseMatrix_print(char *, SparseMatrix A);/*print to stdout in Mathematica format*/