Changeset 10121

Timestamp:

Nov 21, 2006, 8:29:07 AM (19 years ago)

Author:

magnier

Message:

divide initial guess by Qii (previously assumed input matrix was normalized)

File:

• trunk/psLib/src/math/psSparse.c (modified) (3 diffs)

trunk/psLib/src/math/psSparse.c

@@ -141 +141 @@
 }
 
+// solve Ax = B
 psVector *psSparseSolve(psVector *output, psSparseConstraint constraint, const psSparse *sparse, int Niter)
 {
@@ -151 +152 @@
     psVector *Bfj = sparse->Bfj;
 
+    // initial guess is B / Qii
     output = psVectorCopy(output, Bfj, PS_DATA_F32);
+    for (int i = 0; i < output->n; i++) {
+        output->data.F32[i] /= Qii->data.F32[i];
+    }
 
     // temporary storage for intermediate results
@@ -429 +434 @@
 
         // solve Sx = f
-        xVec = psSparseSolve(xVec, constraint, border->sparse, 4);
+        xVec = psSparseSolve(xVec, constraint, border->sparse, Niter);
 
         dG = psSparseBorderLowerProduct (dG, border, xVec);