diff options
Diffstat (limited to 'schofield.wl')
| -rw-r--r-- | schofield.wl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/schofield.wl b/schofield.wl index 98f9721..98dc607 100644 --- a/schofield.wl +++ b/schofield.wl @@ -124,13 +124,13 @@ eqMid[F_, h_][m_] := D[ Φs = { -1.19773338379799339, -0.31881012489061, - 0.110886196683, - 0.01642689465, - -2.639978 10^-4, - -5.140526 10^-4, - 2.08856 10^-4, - -4.4819 10^-5, - 3.16 10^-7, + Around[0.110886196683, 2.0 10^-12], + Around[0.01642689465, 1.0 10^-11], + Around[-2.639978 10^-4, 1.0 10^-10], + Around[-5.140526 10^-4, 1.0 10^-10], + Around[2.08865 10^-4, 1.0 10^-9], + Around[-4.4819 10^-5, 1.0 10^-9], + Around[3.194 10^-7, 1.0 10^-9], 4.31 10^-6, -1.99 10^-6 } @@ -189,8 +189,11 @@ resLow[n_, g_, δ_][m_] := formResiduals[Gls[[;;m+1]], dGdξLowList[n, g][m], δ resHigh[n_, g_, δ_][m_] := Rest[formResiduals[Ghs[[;;m+1]], dGdξList[n, g][m, 0], δ][[;;;;2]]] +resMid[n_, g_, δ_][m_] := formResiduals[Φs[[;;m+1]], dΦdηList[n, g][m, 1], δ] + res[F_, g_, δ_][m_] := Join[resLow[F, g, δ][m], resHigh[F, g, δ][m]] //. rules[g] chiSquared[F_, g_, δ_][m_] := Total[res[F, g, δ][m]^2] +resAll[F_, g_, δ_][m_] := Join[resLow[F, g, δ][m], resHigh[F, g, δ][m], resMid[F, g, δ][m](*, {ruleθ0[g] / 0.00005 /. Around[x_, _] :> x}*)] //. rules[g] newSol[eqs_, oldSol_, newVars_, δ_:0, γ_:0, opts___] := FindRoot[ eqs, @@ -198,7 +201,7 @@ newSol[eqs_, oldSol_, newVars_, δ_:0, γ_:0, opts___] := FindRoot[ {#1, #2 + γ * RandomVariate[NormalDistribution[]]} & @@@ (oldSol /. Rule -> List), Thread[{newVars, δ * RandomVariate[NormalDistribution[], Length[newVars]]}] ], - MaxIterations -> 1000, + MaxIterations -> 10000, opts ] |