From 7c44546421ed1c4bc6e5135ec90bccac2a0ac436 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Mon, 19 May 2025 12:17:36 -0300 Subject: Cleaned up header inclusions, and renamed some p-spin functions --- p-spin.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'p-spin.cpp') diff --git a/p-spin.cpp b/p-spin.cpp index 3691ed6..ba18c6a 100644 --- a/p-spin.cpp +++ b/p-spin.cpp @@ -1,25 +1,25 @@ #include "p-spin.hpp" -inline Real fP(unsigned p, Real q) { +inline Real fₚ(unsigned p, Real q) { return 0.5 * pow(q, p); } -inline Real dfP(unsigned p, Real q) { +inline Real ∂fₚ(unsigned p, Real q) { return 0.5 * p * pow(q, p - 1); } -inline Real ddfP(unsigned p, Real q) { +inline Real ∂∂fₚ(unsigned p, Real q) { return 0.5 * p * (p - 1) * pow(q, p - 2); } Real f(Real λ, unsigned p, unsigned s, Real q) { - return (1 - λ) * fP(p, q) + λ * fP(s, q); + return (1 - λ) * fₚ(p, q) + λ * fₚ(s, q); } -Real df(Real λ, unsigned p, unsigned s, Real q) { - return (1 - λ) * dfP(p, q) + λ * dfP(s, q); +Real ∂f(Real λ, unsigned p, unsigned s, Real q) { + return (1 - λ) * ∂fₚ(p, q) + λ * ∂fₚ(s, q); } -Real ddf(Real λ, unsigned p, unsigned s, Real q) { - return (1 - λ) * ddfP(p, q) + λ * ddfP(s, q); +Real ∂∂f(Real λ, unsigned p, unsigned s, Real q) { + return (1 - λ) * ∂∂fₚ(p, q) + λ * ∂∂fₚ(s, q); } -- cgit v1.2.3-70-g09d2