From 181db84a8ffb26e436a43bb268fe5ef060206e66 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 3 Nov 2017 15:56:35 -0400 Subject: add last term to the convex function --- lib/convex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'lib/convex.c') diff --git a/lib/convex.c b/lib/convex.c index 4816aeb..096504d 100644 --- a/lib/convex.c +++ b/lib/convex.c @@ -66,22 +66,28 @@ double *get_convex_minorant(uint64_t n, double *Gammas) { pos = L; - double *g = (double *)calloc(n, sizeof(double)); + double *g = (double *)calloc(n + 1, sizeof(double)); double rho = 0; - for (uint64_t i = 0; i < n; i++) { + for (uint64_t i = 0; i < n + 1; i++) { if (i > pos->next->p->x) { pos = pos->next; } g[i] = pos->p->y + ((double)i - (double)(pos->p->x)) * (pos->next->p->y - pos->p->y) / ((double)(pos->next->p->x) - (double)(pos->p->x)); - if (Gammas[i] - g[i] > rho) { - rho = Gammas[i] - g[i]; + if (i rho) { + rho = Gammas[i] - g[i]; + } + } else { + if (0 - g[i] > rho) { + rho = 0 - g[i]; + } } } - for (uint64_t i = 0; i < n; i++) { + for (uint64_t i = 0; i < n + 1; i++) { g[i] += rho / 2; } -- cgit v1.2.3-70-g09d2