diff options
Diffstat (limited to 'schofield.wl')
| -rw-r--r-- | schofield.wl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/schofield.wl b/schofield.wl index 3a57f96..c60daf5 100644 --- a/schofield.wl +++ b/schofield.wl @@ -177,7 +177,7 @@ GhRules = MapIndexed[dRule[Gh], Ghs]; rules[g_] := Join[ΦRules, GlRules, GhRules, {ruleAL[g], ruleB[g], gC[0] -> 1}] -eqAround[n_, g_][m_, p_, q_] := Flatten[Join[{ruleθ0[g], ruleAH[g]}, eqLow[n, g][#] & /@ Range[0, m],eqMid[RF[n], g][#] & /@ Range[0, p], eqHigh[n, g] /@ Range[2, q, 2]]] //. rules[g] +eqAround[n_, g_][m_, p_, q_] := Flatten[Join[{ruleAH[g], ruleθ0[g]}, eqLow[n, g][#] & /@ Range[0, m],eqMid[RF[n], g][#] & /@ Range[0, p], eqHigh[n, g] /@ Range[2, q, 2]]] //. rules[g] formResiduals[data_, functions_, δ_:10^(-15)] := If[Head[#1]===Around, (#2-#1["Value"]) / Max[#1["Uncertainty"], δ], @@ -196,7 +196,7 @@ newSol[eqs_, oldSol_, newVars_, δ_:0, γ_:0, opts___] := FindRoot[ {#1, #2 + γ * RandomVariate[NormalDistribution[]]} & @@@ (oldSol /. Rule -> List), Thread[{newVars, δ * RandomVariate[NormalDistribution[], Length[newVars]]}] ], - MaxIterations -> 500, + MaxIterations -> 1000, opts ] @@ -229,7 +229,7 @@ levenbergMarquardt[r_, β0_, λ0_ : 1, ν_ : 2, ε_ : 10^-15] := ] -levenbergMarquardtHelper[Δ_, rf_, Jf_, β0_, λ0_ : 1, ν_ : 1.5, ε_ : 10^-15, accOff_ : False] := +levenbergMarquardtHelper[Δ_, rf_, Jf_, β0_, λ0_ : 1, ν_ : 2, ε_ : 10^-15, accOff_ : False] := Module[ { n = Length[β0], |