Changes between Version 10 and Version 11 of PolynomialExpansion


Ignore:
Timestamp:
01/26/16 11:27:19 (10 years ago)
Author:
sili
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • PolynomialExpansion

    v10 v11  
    1616
    1717Step 4: x[i] = x + alpha*p[i]
    18   x[0] = (X3[0]*(X3[0]^2 + X3[1]^2)) / (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2)
     18  x[0] = (X3[0]*(X3[0]^2^ + X3[1]^2^)) / (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^)
    1919
    20   x[1] = (X3[1]*(X3[0]^2 + X3[1]^2)) / (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2)
     20  x[1] = (X3[1]*(X3[0]^2^ + X3[1]^2^)) / (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^)
    2121
    2222Step 5: beta = (rk[i]*rk[i]) / (r[i]*r[i])
    23   beta = (X1*X3[0]^2 - X0*X3[0]*X3[1] + X2*X3[0]*X3[1] - X1*X3[1]^2)^2 / (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2)^2
     23  beta = (X1*X3[0]^2^ - X0*X3[0]*X3[1] + X2*X3[0]*X3[1] - X1*X3[1]^2)^2^ / (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^)^2^
    2424
    2525Step 6: p[i] = rk[i] +beta * p
    26   p[0] = (-1)*((X1*X3[0] + X2*X3[1])*(X3[0]^2 + X3[1]^2)*(-X1*X3[0]^2 + X0*X3[0]*X3[1] - X2*X3[0]*X3[1] + X1*X3[1]^2)) / (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2)^2
     26  p[0] = (-1)*((X1*X3[0] + X2*X3[1])*(X3[0]^2^ + X3[1]^2^)*(-X1*X3[0]^2^ + X0*X3[0]*X3[1] - X2*X3[0]*X3[1] + X1*X3[1]^2^)) / (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^)^2^
    2727
    28   p[1] = ((X0*X3[0] + X1*X3[1])*(X3[0]^2 + X3[1]^2)*(-X1*X3[0]^2 + X0*X3[0]*X3[1] - X2*X3[0]*X3[1] + X1*X3[1]^2)) / (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2)^2
     28  p[1] = ((X0*X3[0] + X1*X3[1])*(X3[0]^2^ + X3[1]^2^)*(-X1*X3[0]^2^ + X0*X3[0]*X3[1] - X2*X3[0]*X3[1] + X1*X3[1]^2^)) / (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^)^2^
    2929
    3030Step 7: alpha = (r[i]*r[i]) / (p[i]*A[i][j]*p[j])
    31   alpha = (X0*X3[0]^2 + 2*X1*X3[0]*X3[1] + X2*X3[1]^2) / ((-X1^2 + X0 X2) (X3[0]^2 + X3[1]^2))
     31  alpha = (X0*X3[0]^2^ + 2*X1*X3[0]*X3[1] + X2*X3[1]^2^) / ((-X1^2^ + X0 X2) (X3[0]^2^ + X3[1]^2^))
    3232
    3333Step 8: r[i] = r - alpha * A[i][j] * p[j]
    … …  
    3636
    3737Step 9: x[i] = x + alpha*p[i]
    38   x[0] = (X2*X3[0] - X1*X3[1]) / (X0*X2 - X1^2)
    39   x[1] = (-X1 X3[0] + X0 X3[1]) / (X0*X2 - X1^2)
     38  x[0] = (X2*X3[0] - X1*X3[1]) / (X0*X2 - X1^2^)
     39  x[1] = (-X1 X3[0] + X0 X3[1]) / (X0*X2 - X1^2^)
    4040
    4141END