Changeset 5653 for trunk/psphot/src/psphotSparseMatrix.c

Timestamp:

Dec 1, 2005, 6:14:50 AM (21 years ago)

Author:

eugene

Message:

testing psSparse

File:

• trunk/psphot/src/psphotSparseMatrix.c (modified) (2 diffs)

trunk/psphot/src/psphotSparseMatrix.c

@@ -1 +1 @@
 # include "psphot.h"
-
-typedef struct {
-    psVector *Aij;
-    psVector *Bfj;
-    psVector *Qii;
-    psVector *Si;
-    psVector *Sj;
-    int Nelem;
-    int Nrow;
-} psSparse;
-
-void psphotSparseMatrixTest () {
-
-    // build a sparse matrix
-   
-
-} 
-
-psVector *psSparseMatrixTimesVector (psSparse *matrix, psVector *vector) {
-
-    psVector *output = psVectorAlloc (vector->n, PS_DATA_F32);
-    psVectorInit (output, 0);
-
-    Nelem = 0;
-    for (int j = 0; j < vector->n; j++) {
-        F = 0;
-        while (matrix->Sj->data.S32[Nelem] == j) {
-            i = matrix->Sj->data.S32[Nelem];
-            F += vector->data.F32[i] * matrix->Aij->data.F32[i];
-        }
-        output->data.F32[j] = F;
-    }
-    return (output);
-}
 
 psSparse *psphotStarOverlaps (psArray *sources) {
@@ -136 +102 @@
     return (match);
 }
-
-psVector *psSparseSolve (sparse) {
-
-    psVector *Qii = sparse->Qii;
-    psVector *Bfj = sparse->Bfj;
-
-    psVector *Gii = psVectorCopy (NULL, Bfj);
-    psVector *dQ = psVectorAlloc (Gii->n, PS_DATA_F32);
-    psVector *dG = psVectorAlloc (Gii->n, PS_DATA_F32);
-
-    for (int j = 0; j < 2; j++) {
-        dQ = psSparseMatrixTimesVector (dQ, sparse, Gii);
-        for (int i = 0; i < dG->n; i++) {
-            dG->data.F32[i] = (dQ->data.F32[i] - Bfj->data.F32[i]) / Qii->data.F32[i];
-            Gii->data.F32[i] -= dG->data.F32[i];
-        }
-    }
-    psFree (dQ);
-    psFree (dG);
-    
-    return (Gii);
-}