diff --git a/src/maths/KLU/amd.h b/src/maths/KLU/amd.h index 2fcaef117..03d06ddba 100644 --- a/src/maths/KLU/amd.h +++ b/src/maths/KLU/amd.h @@ -94,7 +94,7 @@ UF_long amd_l_order /* see above for description of arguments */ * of the matrix is created (where these conditions do hold), and the copy is * ordered. This feature is new to v2.0 (v1.2 and earlier required this * condition to hold for the input matrix). - * + * * Row indices must be in the range 0 to * n-1. Ap [0] must be zero, and thus nz = Ap [n] is the number of nonzeros * in A. The array Ap is of size n+1, and the array Ai is of size nz = Ap [n]. @@ -161,7 +161,7 @@ UF_long amd_l_order /* see above for description of arguments */ * The Info array provides statistics about the ordering on output. If it is * not present, the statistics are not returned. This is not an error * condition. - * + * * Info [AMD_STATUS]: the return value of AMD, either AMD_OK, * AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID. * @@ -222,7 +222,7 @@ UF_long amd_l_order /* see above for description of arguments */ * * Info [14..19] are not used in the current version, but may be used in * future versions. - */ + */ /* ------------------------------------------------------------------------- */ /* direct interface to AMD */ @@ -245,7 +245,7 @@ void amd_2 int iwlen, int pfree, int Nv [ ], - int Next [ ], + int Next [ ], int Last [ ], int Head [ ], int Elen [ ], @@ -264,7 +264,7 @@ void amd_l2 UF_long iwlen, UF_long pfree, UF_long Nv [ ], - UF_long Next [ ], + UF_long Next [ ], UF_long Last [ ], UF_long Head [ ], UF_long Elen [ ], @@ -351,7 +351,7 @@ void amd_l_info (double Info [ ]) ; /* contents of Info */ #define AMD_STATUS 0 /* return value of amd_order and amd_l_order */ #define AMD_N 1 /* A is n-by-n */ -#define AMD_NZ 2 /* number of nonzeros in A */ +#define AMD_NZ 2 /* number of nonzeros in A */ #define AMD_SYMMETRY 3 /* symmetry of pattern (1 is sym., 0 is unsym.) */ #define AMD_NZDIAG 4 /* # of entries on diagonal */ #define AMD_NZ_A_PLUS_AT 5 /* nz in A+A' */ diff --git a/src/maths/KLU/amd_2.c b/src/maths/KLU/amd_2.c index 97b4f7a36..23b6181c6 100644 --- a/src/maths/KLU/amd_2.c +++ b/src/maths/KLU/amd_2.c @@ -546,7 +546,7 @@ GLOBAL void AMD_2 * p1: Pe [i] for some variable i (start of element list) * p2: Pe [i] + Elen [i] - 1 for some variable i * p3: index of first supervariable in clean list - * p4: + * p4: * pdst: destination pointer, for compression * pend: end of memory to compress * pj: pointer into an element or variable diff --git a/src/maths/KLU/amd_global.c b/src/maths/KLU/amd_global.c index 93f2b4518..2bc707f91 100644 --- a/src/maths/KLU/amd_global.c +++ b/src/maths/KLU/amd_global.c @@ -66,7 +66,7 @@ void *(*amd_calloc) (size_t, size_t) = NULL ; /* ========================================================================= */ /* The user can redefine this global pointer at run-time to change the printf - * routine used by AMD. If NULL, no printing occurs. + * routine used by AMD. If NULL, no printing occurs. * * If -DNPRINT is defined at compile-time, stdio.h is not included. Printing * can then be enabled at run-time by setting amd_printf to a non-NULL function. diff --git a/src/maths/KLU/btf_internal.h b/src/maths/KLU/btf_internal.h index 83f76f1ec..1d675172f 100644 --- a/src/maths/KLU/btf_internal.h +++ b/src/maths/KLU/btf_internal.h @@ -32,10 +32,10 @@ #define NPRINT #endif -/* To enable debugging and assertions, uncomment this line: +/* To enable debugging and assertions, uncomment this line: #undef NDEBUG */ -/* To enable diagnostic printing, uncomment this line: +/* To enable diagnostic printing, uncomment this line: #undef NPRINT */ diff --git a/src/maths/KLU/btf_maxtrans.c b/src/maths/KLU/btf_maxtrans.c index ab3a26ea0..e5df01e68 100644 --- a/src/maths/KLU/btf_maxtrans.c +++ b/src/maths/KLU/btf_maxtrans.c @@ -43,7 +43,7 @@ * * Copyright (c) 2004-2007. Tim Davis, University of Florida, * with support from Sandia National Laboratories. All Rights Reserved. - */ + */ #include "btf.h" #include "btf_internal.h" @@ -59,7 +59,7 @@ * * * column k is not matched to any row * * entries in the path are nonzero - * * the pairs (i1,j1), (i2,j2), (i3,j3) ..., (is,js) have been + * * the pairs (i1,j1), (i2,j2), (i3,j3) ..., (is,js) have been * previously matched to each other * * (i(s+1), js) is nonzero, and row i(s+1) is not matched to any column * @@ -332,7 +332,7 @@ Int BTF(maxtrans) /* returns # of columns in the matching */ for (j = 0 ; j < ncol ; j++) { Cheap [j] = Ap [j] ; - Flag [j] = EMPTY ; + Flag [j] = EMPTY ; } /* all rows and columns are currently unmatched */ diff --git a/src/maths/KLU/colamd.c b/src/maths/KLU/colamd.c index 5fe20d628..f58e33c1e 100644 --- a/src/maths/KLU/colamd.c +++ b/src/maths/KLU/colamd.c @@ -30,7 +30,7 @@ floating point operations than A. Symamd constructs a matrix M such that M'M has the same nonzero pattern of A, and then orders the columns of M using colmmd. The column ordering of M is then returned as the - row and column ordering P of A. + row and column ordering P of A. Authors: @@ -168,7 +168,7 @@ entries are removed prior to ordering. Columns with more than max (16, knobs [COLAMD_DENSE_COL] * sqrt (MIN (n_row,n_col))) entries are removed prior to - ordering, and placed last in the output column ordering. + ordering, and placed last in the output column ordering. Symamd: uses only knobs [COLAMD_DENSE_ROW], which is knobs [0]. Rows and columns with more than @@ -211,7 +211,7 @@ (AQ)'AQ=LL' have less fill-in and require fewer floating point operations than factorizing the unpermuted matrix A or A'A, respectively. - + Returns: TRUE (1) if successful, FALSE (0) otherwise. @@ -378,7 +378,7 @@ Future versions may return more statistics in the stats array. Example: - + See http://www.cise.ufl.edu/research/sparse/colamd/example.c for a complete example. @@ -442,12 +442,12 @@ int A [nnz] ; Input argument. A is an integer array of size nnz, where nnz = p [n]. - + The row indices of the entries in column c of the matrix are held in A [(p [c]) ... (p [c+1]-1)]. The row indices in a given column c need not be in ascending order, and duplicate row indices may be present. However, symamd will run faster - if the columns are in sorted order with no duplicate entries. + if the columns are in sorted order with no duplicate entries. The matrix is 0-based. That is, rows are in the range 0 to n-1, and columns are in the range 0 to n-1. Symamd @@ -489,7 +489,7 @@ Symamd returns FALSE if stats is not present. stats [0]: number of dense or empty row and columns ignored - (and ordered last in the output permutation + (and ordered last in the output permutation perm). Note that a row/column can become "empty" if it contains only "dense" and/or "empty" columns/rows. @@ -789,7 +789,7 @@ typedef struct Colamd_Row_struct #define ONES_COMPLEMENT(r) (-(r)-1) /* -------------------------------------------------------------------------- */ -/* Change for version 2.1: define TRUE and FALSE only if not yet defined */ +/* Change for version 2.1: define TRUE and FALSE only if not yet defined */ /* -------------------------------------------------------------------------- */ #ifndef TRUE @@ -1100,7 +1100,7 @@ PUBLIC size_t COLAMD_recommended /* returns recommended value of Alen. */ Colamd: rows with more than max (16, knobs [0] * sqrt (n_col)) entries are removed prior to ordering. Columns with more than max (16, knobs [1] * sqrt (MIN (n_row,n_col))) entries are removed - prior to ordering, and placed last in the output column ordering. + prior to ordering, and placed last in the output column ordering. Symamd: Rows and columns with more than max (16, knobs [0] * sqrt (n)) entries are removed prior to ordering, and placed last in the @@ -1173,7 +1173,7 @@ PUBLIC Int SYMAMD_MAIN /* return TRUE if OK, FALSE otherwise */ Int nnz ; /* number of entries in A */ Int i ; /* row index of A */ Int j ; /* column index of A */ - Int k ; /* row index of M */ + Int k ; /* row index of M */ Int mnz ; /* number of nonzeros in M */ Int pp ; /* index into a column of A */ Int last_row ; /* last row seen in the current column */ @@ -1625,7 +1625,7 @@ PUBLIC Int COLAMD_MAIN /* returns TRUE if successful, FALSE otherwise*/ stats [COLAMD_DENSE_ROW] = n_row - n_row2 ; stats [COLAMD_DENSE_COL] = n_col - n_col2 ; stats [COLAMD_DEFRAG_COUNT] = ngarbage ; - DEBUG0 (("colamd: done.\n")) ; + DEBUG0 (("colamd: done.\n")) ; return (TRUE) ; } @@ -1687,7 +1687,7 @@ PRIVATE Int init_rows_cols /* returns TRUE if OK, or FALSE otherwise */ Colamd_Col Col [], /* of size n_col+1 */ Int A [], /* row indices of A, of size Alen */ Int p [], /* pointers to columns in A, of size n_col+1 */ - Int stats [COLAMD_STATS] /* colamd statistics */ + Int stats [COLAMD_STATS] /* colamd statistics */ ) { /* === Local variables ================================================== */ diff --git a/src/maths/KLU/colamd.h b/src/maths/KLU/colamd.h index 91665cef7..010796bf6 100644 --- a/src/maths/KLU/colamd.h +++ b/src/maths/KLU/colamd.h @@ -30,7 +30,7 @@ this program, provided that the Copyright, this License, and the Availability of the original version is retained on all copies and made accessible to the end-user of any code or package that includes COLAMD - or any modified version of COLAMD. + or any modified version of COLAMD. Availability: @@ -114,7 +114,7 @@ extern "C" { /* stats [3]: colamd status: zero OK, > 0 warning or notice, < 0 error */ #define COLAMD_STATUS 3 -/* stats [4..6]: error info, or info on jumbled columns */ +/* stats [4..6]: error info, or info on jumbled columns */ #define COLAMD_INFO1 4 #define COLAMD_INFO2 5 #define COLAMD_INFO3 6 diff --git a/src/maths/KLU/colamd_global.c b/src/maths/KLU/colamd_global.c index 4d1ae2230..de4b64640 100644 --- a/src/maths/KLU/colamd_global.c +++ b/src/maths/KLU/colamd_global.c @@ -21,4 +21,3 @@ int (*colamd_printf) (const char *, ...) = printf ; #else int (*colamd_printf) (const char *, ...) = ((void *) 0) ; #endif - diff --git a/src/maths/KLU/klu.c b/src/maths/KLU/klu.c index eb85884c3..a86e7d058 100644 --- a/src/maths/KLU/klu.c +++ b/src/maths/KLU/klu.c @@ -154,7 +154,7 @@ size_t KLU_kernel_factor /* 0 if failure, size of LU if OK */ dunits = DUNITS (Int, lsize) + DUNITS (Entry, lsize) + DUNITS (Int, usize) + DUNITS (Entry, usize) ; lusize = (size_t) dunits ; - ok = !INT_OVERFLOW (dunits) ; + ok = !INT_OVERFLOW (dunits) ; LU = ok ? KLU_malloc (lusize, sizeof (Unit), Common) : NULL ; if (LU == NULL) { diff --git a/src/maths/KLU/klu.h b/src/maths/KLU/klu.h index 78d6c5776..f8e23b9ba 100644 --- a/src/maths/KLU/klu.h +++ b/src/maths/KLU/klu.h @@ -24,7 +24,7 @@ typedef struct { /* A (P,Q) is in upper block triangular form. The kth block goes from * row/col index R [k] to R [k+1]-1. The estimated number of nonzeros - * in the L factor of the kth block is Lnz [k]. + * in the L factor of the kth block is Lnz [k]. */ /* only computed if the AMD ordering is chosen: */ @@ -385,7 +385,7 @@ int klu_z_tsolve double B [ ], /* size 2*ldim*nrhs */ int conj_solve, /* TRUE: conjugate solve, FALSE: solve A.'x=b */ klu_common *Common - + ) ; UF_long klu_l_tsolve (klu_l_symbolic *, klu_l_numeric *, UF_long, UF_long, diff --git a/src/maths/KLU/klu_diagnostics.c b/src/maths/KLU/klu_diagnostics.c index 45cb62764..bd2c861b9 100644 --- a/src/maths/KLU/klu_diagnostics.c +++ b/src/maths/KLU/klu_diagnostics.c @@ -494,7 +494,7 @@ Int KLU_flops /* return TRUE if successful, FALSE otherwise */ /* Compute a really cheap estimate of the reciprocal of the condition number, * condition number, min(abs(diag(U))) / max(abs(diag(U))). If U has a zero * pivot, or a NaN pivot, rcond will be zero. Takes O(n) time. - */ + */ Int KLU_rcond /* return TRUE if successful, FALSE otherwise */ ( diff --git a/src/maths/KLU/klu_internal.h b/src/maths/KLU/klu_internal.h index 662fa8ca2..9ed269bbf 100644 --- a/src/maths/KLU/klu_internal.h +++ b/src/maths/KLU/klu_internal.h @@ -7,7 +7,7 @@ #ifndef _KLU_INTERNAL_H #define _KLU_INTERNAL_H -#include "klu.h" +#include "klu.h" #include "btf.h" #include "klu_version.h" @@ -106,7 +106,7 @@ size_t KLU_kernel /* final size of LU on output */ Int Stack [ ], /* size n */ Int Flag [ ], /* size n */ Int adj_pos [ ], /* size n */ - + /* workspace for pruning only */ Int Lpend [ ], /* size n workspace */ @@ -217,20 +217,20 @@ void KLU_utsolve Entry X [ ] ) ; -Int KLU_valid +Int KLU_valid ( - Int n, - Int Ap [ ], - Int Ai [ ], + Int n, + Int Ap [ ], + Int Ai [ ], Entry Ax [ ] ) ; -Int KLU_valid_LU +Int KLU_valid_LU ( - Int n, - Int flag_test_start_ptr, + Int n, + Int flag_test_start_ptr, Int Xip [ ], - Int Xlen [ ], + Int Xlen [ ], Unit LU [ ] ); diff --git a/src/maths/KLU/klu_sort.c b/src/maths/KLU/klu_sort.c index a3ce98f46..29d412bdc 100644 --- a/src/maths/KLU/klu_sort.c +++ b/src/maths/KLU/klu_sort.c @@ -23,7 +23,7 @@ static void sort (Int n, Int *Xip, Int *Xlen, Unit *LU, Int *Tp, Int *Tj, ASSERT (KLU_valid_LU (n, FALSE, Xip, Xlen, LU)) ; - /* count the number of entries in each row of L or U */ + /* count the number of entries in each row of L or U */ for (i = 0 ; i < n ; i++) { W [i] = 0 ; diff --git a/src/maths/KLU/klu_version.h b/src/maths/KLU/klu_version.h index 9e8812107..71099c380 100644 --- a/src/maths/KLU/klu_version.h +++ b/src/maths/KLU/klu_version.h @@ -11,7 +11,7 @@ #define Int_MAX INT_MAX #endif -#define NPRINT +#define NPRINT #define BYTES(type,n) (sizeof (type) * (n)) #define CEILING(b,u) (((b)+(u)-1) / (u)) @@ -37,7 +37,7 @@ } /* function names */ -#ifdef COMPLEX +#ifdef COMPLEX #ifdef DLONG @@ -47,7 +47,7 @@ #define KLU_free_numeric klu_zl_free_numeric #define KLU_factor klu_zl_factor #define KLU_refactor klu_zl_refactor -#define KLU_kernel_factor klu_zl_kernel_factor +#define KLU_kernel_factor klu_zl_kernel_factor #define KLU_lsolve klu_zl_lsolve #define KLU_ltsolve klu_zl_ltsolve #define KLU_usolve klu_zl_usolve @@ -70,7 +70,7 @@ #define KLU_free_numeric klu_z_free_numeric #define KLU_factor klu_z_factor #define KLU_refactor klu_z_refactor -#define KLU_kernel_factor klu_z_kernel_factor +#define KLU_kernel_factor klu_z_kernel_factor #define KLU_lsolve klu_z_lsolve #define KLU_ltsolve klu_z_ltsolve #define KLU_usolve klu_z_usolve @@ -97,7 +97,7 @@ #define KLU_free_numeric klu_l_free_numeric #define KLU_factor klu_l_factor #define KLU_refactor klu_l_refactor -#define KLU_kernel_factor klu_l_kernel_factor +#define KLU_kernel_factor klu_l_kernel_factor #define KLU_lsolve klu_l_lsolve #define KLU_ltsolve klu_l_ltsolve #define KLU_usolve klu_l_usolve @@ -120,7 +120,7 @@ #define KLU_free_numeric klu_free_numeric #define KLU_factor klu_factor #define KLU_refactor klu_refactor -#define KLU_kernel_factor klu_kernel_factor +#define KLU_kernel_factor klu_kernel_factor #define KLU_lsolve klu_lsolve #define KLU_ltsolve klu_ltsolve #define KLU_usolve klu_usolve