# HG changeset patch # User Rik # Date 1453246998 28800 # Node ID 358aa7fcbd33a75258035afdc0c74ce4acc4f1c4 # Parent 7bb96a8df9122fd4ed12fdf092b3aa0b28d9c7db Rename errwarn_singular_matrix to warn_singular_matrix. * inv.cc, sparse-xdiv.cc, xdiv.cc, CMatrix.cc, CSparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, lo-array-errwarn.cc, lo-array-errwarn.h: Rename errwarn_singular_matrix to warn_singular_matrix. diff -r 7bb96a8df912 -r 358aa7fcbd33 libinterp/corefcn/inv.cc --- a/libinterp/corefcn/inv.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/libinterp/corefcn/inv.cc Tue Jan 19 15:43:18 2016 -0800 @@ -206,7 +206,7 @@ } if (nargout < 2 && (info == -1 || rcond_plus_one_eq_one)) - errwarn_singular_matrix (isfloat ? frcond : rcond); + warn_singular_matrix (isfloat ? frcond : rcond); return retval; } diff -r 7bb96a8df912 -r 358aa7fcbd33 libinterp/corefcn/sparse-xdiv.cc --- a/libinterp/corefcn/sparse-xdiv.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/libinterp/corefcn/sparse-xdiv.cc Tue Jan 19 15:43:18 2016 -0800 @@ -44,7 +44,7 @@ static void solve_singularity_warning (double rcond) { - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } template diff -r 7bb96a8df912 -r 358aa7fcbd33 libinterp/corefcn/xdiv.cc --- a/libinterp/corefcn/xdiv.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/libinterp/corefcn/xdiv.cc Tue Jan 19 15:43:18 2016 -0800 @@ -59,7 +59,7 @@ static void solve_singularity_warning (double rcond) { - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } template @@ -403,7 +403,7 @@ static void solve_singularity_warning (float rcond) { - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } INSTANTIATE_MX_LEFTDIV_CONFORM (FloatMatrix, FloatMatrix); diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/CMatrix.cc --- a/liboctave/array/CMatrix.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/CMatrix.cc Tue Jan 19 15:43:18 2016 -0800 @@ -2013,7 +2013,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -2108,7 +2108,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -2193,7 +2193,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } @@ -2252,7 +2252,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (); + warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -2280,7 +2280,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/CSparse.cc --- a/liboctave/array/CSparse.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/CSparse.cc Tue Jan 19 15:43:18 2016 -0800 @@ -1799,7 +1799,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -1814,7 +1814,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2082,7 +2082,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2097,7 +2097,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2312,7 +2312,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2327,7 +2327,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2595,7 +2595,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2610,7 +2610,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2845,7 +2845,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2860,7 +2860,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3147,7 +3147,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3162,7 +3162,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3401,7 +3401,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3416,7 +3416,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3702,7 +3702,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3717,7 +3717,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3864,7 +3864,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else @@ -3961,7 +3961,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4163,7 +4163,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } } else if (typ != MatrixType::Tridiagonal_Hermitian) @@ -4258,7 +4258,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4427,7 +4427,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4512,7 +4512,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4545,7 +4545,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4669,7 +4669,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4787,7 +4787,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4820,7 +4820,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4983,7 +4983,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5066,7 +5066,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -5099,7 +5099,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5225,7 +5225,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5348,7 +5348,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -5381,7 +5381,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5534,7 +5534,7 @@ if (sing_handler) sing_handler (rcond); else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } else if (status < 0) { @@ -5684,7 +5684,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -5939,7 +5939,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6222,7 +6222,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6456,7 +6456,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6587,7 +6587,7 @@ if (sing_handler) sing_handler (rcond); else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } UMFPACK_ZNAME (report_info) (control, info); diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/dMatrix.cc --- a/liboctave/array/dMatrix.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/dMatrix.cc Tue Jan 19 15:43:18 2016 -0800 @@ -1640,7 +1640,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -1734,7 +1734,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -1817,7 +1817,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } @@ -1870,7 +1870,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (); + warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1898,7 +1898,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/dSparse.cc --- a/liboctave/array/dSparse.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/dSparse.cc Tue Jan 19 15:43:18 2016 -0800 @@ -1883,7 +1883,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -1898,7 +1898,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2166,7 +2166,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2181,7 +2181,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2398,7 +2398,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2413,7 +2413,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2683,7 +2683,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2698,7 +2698,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -2937,7 +2937,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -2952,7 +2952,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3238,7 +3238,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3253,7 +3253,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3493,7 +3493,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3508,7 +3508,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3796,7 +3796,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } volatile double rcond_plus_one = rcond + 1.0; @@ -3811,7 +3811,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -3958,7 +3958,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else rcond = 1.; @@ -4054,7 +4054,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4256,7 +4256,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } } else if (typ != MatrixType::Tridiagonal_Hermitian) @@ -4350,7 +4350,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4540,7 +4540,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4625,7 +4625,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4658,7 +4658,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4782,7 +4782,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -4900,7 +4900,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -4933,7 +4933,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5096,7 +5096,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5210,7 +5210,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -5243,7 +5243,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5390,7 +5390,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5534,7 +5534,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (); + warn_singular_matrix (); } else { @@ -5567,7 +5567,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } } else @@ -5729,7 +5729,7 @@ if (sing_handler) sing_handler (rcond); else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); } else if (status < 0) { @@ -5881,7 +5881,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6109,7 +6109,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6363,7 +6363,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } @@ -6609,7 +6609,7 @@ mattype.mark_as_rectangular (); } else - errwarn_singular_matrix (rcond); + warn_singular_matrix (rcond); return retval; } diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/fCMatrix.cc --- a/liboctave/array/fCMatrix.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/fCMatrix.cc Tue Jan 19 15:43:18 2016 -0800 @@ -2005,7 +2005,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -2100,7 +2100,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -2185,7 +2185,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } @@ -2240,7 +2240,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (); + warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -2268,7 +2268,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/array/fMatrix.cc --- a/liboctave/array/fMatrix.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/array/fMatrix.cc Tue Jan 19 15:43:18 2016 -0800 @@ -1652,7 +1652,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } @@ -1748,7 +1748,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } } @@ -1832,7 +1832,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } @@ -1885,7 +1885,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (); + warn_singular_matrix (); mattype.mark_as_rectangular (); } @@ -1913,7 +1913,7 @@ if (sing_handler) sing_handler (rcon); else - errwarn_singular_matrix (rcon); + warn_singular_matrix (rcon); } } diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/util/lo-array-errwarn.cc --- a/liboctave/util/lo-array-errwarn.cc Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/util/lo-array-errwarn.cc Tue Jan 19 15:43:18 2016 -0800 @@ -309,7 +309,7 @@ } void -errwarn_singular_matrix (double rcond) +warn_singular_matrix (double rcond) { if (rcond == 0.0) { diff -r 7bb96a8df912 -r 358aa7fcbd33 liboctave/util/lo-array-errwarn.h --- a/liboctave/util/lo-array-errwarn.h Tue Jan 19 15:08:59 2016 -0800 +++ b/liboctave/util/lo-array-errwarn.h Tue Jan 19 15:43:18 2016 -0800 @@ -152,6 +152,6 @@ void err_invalid_resize (void); OCTAVE_API extern -void errwarn_singular_matrix (double rcond = 0.0); +void warn_singular_matrix (double rcond = 0.0); #endif