diff options
Diffstat (limited to 'schofield.wl')
| -rw-r--r-- | schofield.wl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/schofield.wl b/schofield.wl index d3ad6d2..ecf61ff 100644 --- a/schofield.wl +++ b/schofield.wl @@ -59,39 +59,39 @@ invDerivativeList[n_][f_][x_] := Module[ MapIndexed[{Pn, i} \[Function] Pn/dfs[[1]]^(2 i[[1]] - 1), Pns] ] -dGdξLowList[n_, h_][m_] := Module[ +dGdξLowList[n_, h_, params_:{}][m_] := Module[ { ds, dF, df }, - ds = invDerivativeList[m+1][Function[θ, h[θ] / t[θ]^Δ[2]]][θc]; - dF = NestList[Function[f, D[f, θ]], RFReg[n][θ], m] + Table[dfLow[AL, B][k], {k, 0, m}] /. θ -> θc; + ds = invDerivativeList[m+1][Function[θ, h[θ] / t[θ]^Δ[2] //. params]][θc //. params]; + dF = NestList[Function[f, D[f, θ]], RFReg[n][θ], m] + Table[dfLow[AL, B][k], {k, 0, m}] /. θ -> θc //. params; df = NestList[D[#, \[Theta]] &, fp[\[Theta]]/t[\[Theta]]^2 - 1/(8 \[Pi]) Log[t[\[Theta]]^2], m] /. Map[Derivative[#][fp][\[Theta]] -> dF[[# + 1]] &, - Range[0, m]] /. θ -> θc; + Range[0, m]] /. θ -> θc //. params; Table[Sum[df[[k+1]] BellY[j, k, ds[[;; j - k + 1]]], {k, 0, j}]/(j!), {j, 0, m}] ] -dGdξList[n_, h_][m_, θp_] := Module[ +dGdξList[n_, h_, params_:{}][m_, θp_] := Module[ { ds, dF, df }, - ds = invDerivativeList[m+1][Function[θ, h[θ] / RealAbs[t[θ]]^Δ[2]]][θp]; - dF = NestList[Function[f, D[f, θ]], RF[n][θ], m] /. θ -> θp; + ds = invDerivativeList[m+1][Function[θ, h[θ] / RealAbs[t[θ]]^Δ[2] //. params]][θp]; + dF = NestList[Function[f, D[f, θ]], RF[n][θ] //. params, m] /. θ -> θp //. params; df = NestList[D[#, \[Theta]] &, fp[\[Theta]]/t[\[Theta]]^2 - 1/(8 \[Pi]) Log[t[\[Theta]]^2], m] /. Map[Derivative[#][fp][\[Theta]] -> dF[[# + 1]] &, - Range[0, m]] /. θ -> θp; + Range[0, m]] /. θ -> θp //. params; Table[Sum[df[[k+1]] BellY[j, k, ds[[;; j - k + 1]]], {k, 0, j}]/(j!), {j, 0, m}] ] -dΦdηList[n_, h_][m_, θp_] := Module[ +dΦdηList[n_, h_, params_:{}][m_, θp_] := Module[ { ds, dF, df }, - ds = invDerivativeList[m+1][Function[θ, t[θ] / h[θ]^(1 / Δ[2])]][θp]; - dF = NestList[Function[f, D[f, θ]], RF[n][θ], m] /. θ -> θp; + ds = invDerivativeList[m+1][Function[θ, t[θ] / h[θ]^(1 / Δ[2]) //. params]][θp]; + dF = NestList[Function[f, D[f, θ]], RF[n][θ] //. params, m] /. θ -> θp; df = NestList[D[#, \[Theta]] &, hh[θ]^(-2 / Δ[]) (fp[θ] - t[θ]^2 Log[hh[θ]^2] / (8 π Δ[])), m] /. Map[Derivative[#][fp][\[Theta]] -> dF[[# + 1]] &, - Range[0, m]] /. hh -> h /. θ -> θp; + Range[0, m]] /. hh -> h /. θ -> θp //. params; Table[Sum[df[[k+1]] BellY[j, k, ds[[;; j - k + 1]]], {k, 0, j}]/(j!), {j, 0, m}] ] @@ -205,7 +205,7 @@ 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] +resAll[F_, g_, δ_][m_] := Join[resLow[F, g, δ][m], resHigh[F, g, δ][m], (*resMid[F, g, δ][m],*) {ruleθ0[g] / 0.00005, ruleAH[g] / 0.02} /. Around[x_, _] :> x] //. rules[g] newSol[eqs_, oldSol_, newVars_, δ_:0, γ_:0, opts___] := FindRoot[ eqs, |