sparse/*.c, whitespace
This commit is contained in:
parent
075b30d686
commit
93052df7d0
|
|
@ -648,7 +648,6 @@ AllocateBlockOfAllocationList(MatrixPtr Matrix)
|
|||
void
|
||||
spDestroy(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
AllocationListPtr ListPtr, NextListPtr;
|
||||
|
||||
|
||||
|
|
@ -743,8 +742,6 @@ spError(MatrixPtr Matrix )
|
|||
void
|
||||
spWhereSingular(MatrixPtr Matrix, int *pRow, int *pCol)
|
||||
{
|
||||
|
||||
|
||||
/* Begin `spWhereSingular'. */
|
||||
assert( IS_SPARSE( Matrix ) );
|
||||
|
||||
|
|
@ -781,8 +778,6 @@ spWhereSingular(MatrixPtr Matrix, int *pRow, int *pCol)
|
|||
int
|
||||
spGetSize(MatrixPtr Matrix, int External)
|
||||
{
|
||||
|
||||
|
||||
/* Begin `spGetSize'. */
|
||||
assert( IS_SPARSE( Matrix ) );
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ static void ExpandTranslationArrays( MatrixPtr, int );
|
|||
void
|
||||
spClear(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
int I;
|
||||
|
||||
|
|
@ -183,7 +182,6 @@ spClear(MatrixPtr Matrix)
|
|||
RealNumber *
|
||||
spFindElement(MatrixPtr Matrix, int Row, int Col)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
|
||||
/* Begin `spFindElement'. */
|
||||
|
|
@ -266,7 +264,6 @@ ElementPtr pElement;
|
|||
RealNumber *
|
||||
spGetElement(MatrixPtr Matrix, int Row, int Col)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
|
||||
/* Begin `spGetElement'. */
|
||||
|
|
@ -1148,7 +1145,6 @@ spGetInitInfo(RealNumber *pElement)
|
|||
int
|
||||
spInitialize(MatrixPtr Matrix, int (*pInit)(RealNumber*, void *InitInfo, int , int Col))
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
int J, Error, Col;
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,6 @@ int
|
|||
spOrderAndFactor(MatrixPtr Matrix, RealNumber RHS[], RealNumber RelThreshold,
|
||||
RealNumber AbsThreshold, int DiagPivoting)
|
||||
{
|
||||
|
||||
ElementPtr pPivot;
|
||||
int Step, Size, ReorderingRequired;
|
||||
RealNumber LargestInCol;
|
||||
|
|
@ -323,7 +322,6 @@ Done:
|
|||
int
|
||||
spFactor(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
ElementPtr pColumn;
|
||||
int Step, Size;
|
||||
|
|
@ -571,7 +569,6 @@ FactorComplexMatrix( MatrixPtr Matrix )
|
|||
void
|
||||
spPartition(MatrixPtr Matrix, int Mode)
|
||||
{
|
||||
|
||||
ElementPtr pElement, pColumn;
|
||||
int Step, Size;
|
||||
int *Nc, *No, *Nm;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ int Printer_Width = PRINTER_WIDTH;
|
|||
void
|
||||
spPrint(MatrixPtr Matrix, int PrintReordered, int Data, int Header)
|
||||
{
|
||||
|
||||
int J = 0;
|
||||
int I, Row, Col, Size, Top;
|
||||
int StartCol = 1, StopCol, Columns, ElementCount = 0;
|
||||
|
|
@ -441,7 +440,6 @@ int
|
|||
spFileMatrix(MatrixPtr Matrix, char *File, char *Label, int Reordered,
|
||||
int Data, int Header)
|
||||
{
|
||||
|
||||
int I, Size;
|
||||
ElementPtr pElement;
|
||||
int Row, Col, Err;
|
||||
|
|
@ -599,7 +597,6 @@ spFileMatrix(MatrixPtr Matrix, char *File, char *Label, int Reordered,
|
|||
int
|
||||
spFileVector(MatrixPtr Matrix, char *File, RealVector RHS, RealVector iRHS)
|
||||
{
|
||||
|
||||
int I, Size, Err;
|
||||
FILE *pMatrixFile;
|
||||
|
||||
|
|
@ -690,7 +687,6 @@ spFileVector(MatrixPtr Matrix, char *File, RealVector RHS, RealVector iRHS)
|
|||
int
|
||||
spFileStats(MatrixPtr Matrix, char *File, char *Label)
|
||||
{
|
||||
|
||||
int Size, I;
|
||||
ElementPtr pElement;
|
||||
int NumberOfElements;
|
||||
|
|
|
|||
|
|
@ -422,7 +422,6 @@ SMPcDProd(SMPmatrix *Matrix, SPcomplex *pMantissa, int *pExponent)
|
|||
static void
|
||||
LoadGmin(SMPmatrix *Matrix, double Gmin)
|
||||
{
|
||||
|
||||
int I;
|
||||
ArrayOfElementPtrs Diag;
|
||||
ElementPtr diag;
|
||||
|
|
@ -455,7 +454,6 @@ LoadGmin(SMPmatrix *Matrix, double Gmin)
|
|||
SMPelement *
|
||||
SMPfindElt(SMPmatrix *Matrix, int Row, int Col, int CreateIfMissing)
|
||||
{
|
||||
|
||||
ElementPtr Element;
|
||||
|
||||
/* Begin `SMPfindElt'. */
|
||||
|
|
@ -475,7 +473,6 @@ SMPfindElt(SMPmatrix *Matrix, int Row, int Col, int CreateIfMissing)
|
|||
int
|
||||
SMPcZeroCol(SMPmatrix *Matrix, int Col)
|
||||
{
|
||||
|
||||
ElementPtr Element;
|
||||
|
||||
Col = Matrix->ExtToIntColMap[Col];
|
||||
|
|
@ -497,7 +494,6 @@ SMPcZeroCol(SMPmatrix *Matrix, int Col)
|
|||
int
|
||||
SMPcAddCol(SMPmatrix *Matrix, int Accum_Col, int Addend_Col)
|
||||
{
|
||||
|
||||
ElementPtr Accum, Addend, *Prev;
|
||||
|
||||
Accum_Col = Matrix->ExtToIntColMap[Accum_Col];
|
||||
|
|
@ -529,7 +525,6 @@ SMPcAddCol(SMPmatrix *Matrix, int Accum_Col, int Addend_Col)
|
|||
int
|
||||
SMPzeroRow(SMPmatrix *Matrix, int Row)
|
||||
{
|
||||
|
||||
ElementPtr Element;
|
||||
|
||||
Row = Matrix->ExtToIntColMap[Row];
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ void
|
|||
spSolve(MatrixPtr Matrix, RealVector RHS, RealVector Solution,
|
||||
RealVector iRHS, RealVector iSolution)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
RealVector Intermediate;
|
||||
RealNumber Temp;
|
||||
|
|
@ -403,7 +402,6 @@ void
|
|||
spSolveTransposed(MatrixPtr Matrix, RealVector RHS, RealVector Solution,
|
||||
RealVector iRHS, RealVector iSolution)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
RealVector Intermediate;
|
||||
int I, *pExtOrder, Size;
|
||||
|
|
|
|||
|
|
@ -176,7 +176,6 @@ static void ComplexTransposedMatrixMultiply( MatrixPtr, RealVector, RealVector,
|
|||
void
|
||||
spMNA_Preorder(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
int J, Size;
|
||||
ElementPtr pTwin1, pTwin2;
|
||||
int Twins, StartAt = 1;
|
||||
|
|
@ -370,7 +369,6 @@ SwapCols( MatrixPtr Matrix, ElementPtr pTwin1, ElementPtr pTwin2 )
|
|||
void
|
||||
spScale(MatrixPtr Matrix, RealVector RHS_ScaleFactors, RealVector SolutionScaleFactors)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
int I, lSize, *pExtOrder;
|
||||
RealNumber ScaleFactor;
|
||||
|
|
@ -579,7 +577,6 @@ spMultiply(MatrixPtr Matrix, RealVector RHS, RealVector Solution,
|
|||
RealNumber Sum;
|
||||
int I, *pExtOrder;
|
||||
|
||||
|
||||
/* Begin `spMultiply'. */
|
||||
assert( IS_SPARSE( Matrix ) && !Matrix->Factored );
|
||||
if (!Matrix->RowsLinked)
|
||||
|
|
@ -725,7 +722,6 @@ spMultTransposed(MatrixPtr Matrix, RealVector RHS, RealVector Solution,
|
|||
RealNumber Sum;
|
||||
int I, *pExtOrder;
|
||||
|
||||
|
||||
/* Begin `spMultTransposed'. */
|
||||
assert( IS_SPARSE( Matrix ) && !Matrix->Factored );
|
||||
if (!Matrix->InternalVectorsAllocated)
|
||||
|
|
@ -881,7 +877,6 @@ void
|
|||
spDeterminant(MatrixPtr Matrix, int *pExponent, RealNumber *pDeterminant,
|
||||
RealNumber *piDeterminant)
|
||||
{
|
||||
|
||||
int I, Size;
|
||||
RealNumber Norm, nr, ni;
|
||||
ComplexNumber Pivot, cDeterminant;
|
||||
|
|
@ -1039,7 +1034,6 @@ spDeterminant(MatrixPtr Matrix, int *pExponent, RealNumber *pDeterminant,
|
|||
void
|
||||
spStripFills(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
struct FillinListNodeStruct *pListNode;
|
||||
|
||||
/* Begin `spStripFills'. */
|
||||
|
|
@ -1111,8 +1105,6 @@ spStripFills(MatrixPtr Matrix)
|
|||
void
|
||||
spStripMatrix(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
|
||||
/* Begin `spStripMatrix'. */
|
||||
assert( IS_SPARSE( Matrix ) );
|
||||
if (Matrix->Elements == 0) return;
|
||||
|
|
@ -1124,7 +1116,6 @@ spStripMatrix(MatrixPtr Matrix)
|
|||
|
||||
/* Reset the element lists. */
|
||||
{
|
||||
|
||||
struct ElementListNodeStruct *pListNode;
|
||||
|
||||
pListNode = Matrix->LastElementListNode = Matrix->FirstElementListNode;
|
||||
|
|
@ -1134,7 +1125,6 @@ spStripMatrix(MatrixPtr Matrix)
|
|||
|
||||
/* Reset the fill-in lists. */
|
||||
{
|
||||
|
||||
struct FillinListNodeStruct *pListNode;
|
||||
|
||||
pListNode = Matrix->LastFillinListNode = Matrix->FirstFillinListNode;
|
||||
|
|
@ -1199,7 +1189,6 @@ spStripMatrix(MatrixPtr Matrix)
|
|||
void
|
||||
spDeleteRowAndCol(MatrixPtr Matrix, int Row, int Col)
|
||||
{
|
||||
|
||||
ElementPtr pElement, *ppElement, pLastElement;
|
||||
int Size, ExtRow, ExtCol;
|
||||
ElementPtr spcFindElementInCol();
|
||||
|
|
@ -1312,7 +1301,6 @@ spDeleteRowAndCol(MatrixPtr Matrix, int Row, int Col)
|
|||
RealNumber
|
||||
spPseudoCondition(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
int I;
|
||||
ArrayOfElementPtrs Diag;
|
||||
RealNumber MaxPivot, MinPivot, Mag;
|
||||
|
|
@ -1403,7 +1391,6 @@ spPseudoCondition(MatrixPtr Matrix)
|
|||
RealNumber
|
||||
spCondition(MatrixPtr Matrix, RealNumber NormOfMatrix, int *pError)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
RealVector T, Tm;
|
||||
int I, K, Row;
|
||||
|
|
@ -1831,7 +1818,6 @@ int *pError;
|
|||
RealNumber
|
||||
spNorm(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
int I;
|
||||
RealNumber Max = 0.0, AbsRowSum;
|
||||
|
|
@ -1949,7 +1935,6 @@ spNorm(MatrixPtr Matrix)
|
|||
RealNumber
|
||||
spLargestElement(MatrixPtr Matrix)
|
||||
{
|
||||
|
||||
int I;
|
||||
RealNumber Mag, AbsColSum, Max = 0.0, MaxRow = 0.0, MaxCol = 0.0;
|
||||
RealNumber Pivot;
|
||||
|
|
@ -2078,7 +2063,6 @@ spLargestElement(MatrixPtr Matrix)
|
|||
RealNumber
|
||||
spRoundoff(MatrixPtr Matrix, RealNumber Rho)
|
||||
{
|
||||
|
||||
ElementPtr pElement;
|
||||
int Count, I, MaxCount = 0;
|
||||
RealNumber Reid, Gear;
|
||||
|
|
|
|||
Loading…
Reference in New Issue