diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java index 24dd660ae02389014f95a2cef517af9cc4270430..b0ba2dc9d0346a58c083a77402d22bff2b85aefa 100644 --- a/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java +++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java @@ -116,7 +116,7 @@ public class StatisticUtil { if(diffInDays >= 365){ return co2Sum / (((double) (diffInDays +1) / 365.0) * (double) numberOfPerson); }else { - return (((co2Sum)/((double) numberOfPerson) + 118.0) /2.0); + return (118.0/diffInDays) + (( co2Sum / (((double) (diffInDays +1) / 365.0) * (double) numberOfPerson))/(365.0-(double) diffInDays)); } }