From 1ee6d049987fab4f362cbd7068d3b3982d1e597b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 1 Jun 2016 21:29:55 +0200 Subject: [PATCH] update: Avoid unnecessary inexactness in total_work() Commit 5ba8cab (v4.2.20) replaced milit * 2 / 5.0 by milit * 0.4. Not so smart; 0.4 isn't exact. Go back to milit / 2.5. Signed-off-by: Markus Armbruster --- src/lib/update/populace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c index ce9cc6fc..0f3e2afc 100644 --- a/src/lib/update/populace.c +++ b/src/lib/update/populace.c @@ -28,7 +28,7 @@ * * Known contributors to this file: * Dave Pare, 1986 - * Markus Armbruster, 2004-2014 + * Markus Armbruster, 2004-2016 */ #include @@ -124,5 +124,5 @@ total_work(int sctwork, int etu, int civil, int milit, int uw, int maxpop) if (uw > maxpop) uw = maxpop; - return (civil * sctwork / 100.0 + milit * 0.4 + uw) * etu / 100.0; + return (civil * sctwork / 100.0 + milit / 2.5 + uw) * etu / 100.0; }