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 <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-01 21:29:55 +02:00
parent 876d061875
commit 1ee6d04998

View file

@ -28,7 +28,7 @@
*
* Known contributors to this file:
* Dave Pare, 1986
* Markus Armbruster, 2004-2014
* Markus Armbruster, 2004-2016
*/
#include <config.h>
@ -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;
}