luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sparse/*.c, rename `eMatrix' --> `Matrix'

This commit is contained in:
rlar 2013-04-28 20:04:23 +02:00
parent 9c48863912
commit f30796a7e6
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/maths/sparse/spalloc.c
View File

@ -704,13 +704,13 @@ spDestroy(MatrixPtr Matrix)
* eMatrix <input> (void *)
* The matrix for which the error status is desired. */
int
spError(MatrixPtr eMatrix )
spError(MatrixPtr Matrix )
{
/* Begin `spError'. */
if (eMatrix != NULL) {
assert(eMatrix->ID == SPARSE_ID);
return eMatrix->Error;
if (Matrix != NULL) {
assert(Matrix->ID == SPARSE_ID);
return Matrix->Error;
} else {
/* This error may actually be spPANIC, no way to tell. */
return spNO_MEMORY;
@ -814,23 +814,23 @@ spGetSize(MatrixPtr Matrix, int External)
*/
void
spSetReal(MatrixPtr eMatrix)
spSetReal(MatrixPtr Matrix)
{
/* Begin `spSetReal'. */
assert( IS_SPARSE( eMatrix ));
eMatrix->Complex = NO;
assert( IS_SPARSE( Matrix ));
Matrix->Complex = NO;
return;
}
void
spSetComplex(MatrixPtr eMatrix)
spSetComplex(MatrixPtr Matrix)
{
/* Begin `spSetComplex'. */
assert( IS_SPARSE( eMatrix ));
eMatrix->Complex = YES;
assert( IS_SPARSE( Matrix ));
Matrix->Complex = YES;
return;
}
@ -855,29 +855,29 @@ spSetComplex(MatrixPtr eMatrix)
*/
int
spFillinCount(MatrixPtr eMatrix)
spFillinCount(MatrixPtr Matrix)
{
/* Begin `spFillinCount'. */
assert( IS_SPARSE( eMatrix ) );
return eMatrix->Fillins;
assert( IS_SPARSE( Matrix ) );
return Matrix->Fillins;
}
int
spElementCount(MatrixPtr eMatrix)
spElementCount(MatrixPtr Matrix)
{
/* Begin `spElementCount'. */
assert( IS_SPARSE( eMatrix ) );
return eMatrix->Elements;
assert( IS_SPARSE( Matrix ) );
return Matrix->Elements;
}
int
spOriginalCount(MatrixPtr eMatrix)
spOriginalCount(MatrixPtr Matrix)
{
/* Begin `spOriginalCount'. */
assert( IS_SPARSE( eMatrix ) );
return eMatrix->Originals;
assert( IS_SPARSE( Matrix ) );
return Matrix->Originals;
}

12
src/maths/sparse/sputils.c
View File

@ -2143,17 +2143,17 @@ spRoundoff(MatrixPtr Matrix, RealNumber Rho)
*/
void
spErrorMessage(MatrixPtr eMatrix, FILE *Stream, char *Originator)
spErrorMessage(MatrixPtr Matrix, FILE *Stream, char *Originator)
{
int Row, Col, Error;
/* Begin `spErrorMessage'. */
if (eMatrix == NULL)
if (Matrix == NULL)
Error = spNO_MEMORY;
else
{
assert(eMatrix->ID == SPARSE_ID);
Error = eMatrix->Error;
assert(Matrix->ID == SPARSE_ID);
Error = Matrix->Error;
}
if (Error == spOKAY) return;
@ -2172,13 +2172,13 @@ spErrorMessage(MatrixPtr eMatrix, FILE *Stream, char *Originator)
fprintf( Stream, "insufficient memory available.\n");
else if (Error == spSINGULAR)
{
spWhereSingular( eMatrix, &Row, &Col );
spWhereSingular( Matrix, &Row, &Col );
fprintf( Stream, "singular matrix detected at row %d and column %d.\n",
Row, Col);
}
else if (Error == spZERO_DIAG)
{
spWhereSingular( eMatrix, &Row, &Col );
spWhereSingular( Matrix, &Row, &Col );
fprintf( Stream, "zero diagonal detected at row %d and column %d.\n",
Row, Col);
}