From b843fc9d876c257607e9437b1c1981ba7f0cdcd4 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 12 Jul 2012 08:55:24 +0200 Subject: [PATCH] Bug #1503: Rename IntegerInterval to Interval FEA: ItEr76S04BugFixing --- .../web/dashboard/DashboardController.java | 18 +++++++------- .../web/dashboard/DashboardModel.java | 24 +++++++++---------- .../web/dashboard/IDashboardModel.java | 6 ++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java index 2d7257c0d..c1c138c0a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java @@ -34,7 +34,7 @@ import java.util.Set; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.business.planner.entities.TaskStatusEnum; -import org.libreplan.web.dashboard.DashboardModel.IntegerInterval; +import org.libreplan.web.dashboard.DashboardModel.Interval; import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.ApplicationContext; @@ -344,7 +344,7 @@ public class DashboardController extends GenericForwardComposer { private final IDashboardModel dashboardModel; - private Map taskCompletationData; + private Map taskCompletationData; private TaskCompletationData(IDashboardModel dashboardModel) { this.dashboardModel = dashboardModel; @@ -354,7 +354,7 @@ public class DashboardController extends GenericForwardComposer { return new TaskCompletationData(dashboardModel); } - private Map getData() { + private Map getData() { if (taskCompletationData == null) { taskCompletationData = dashboardModel .calculateTaskCompletion(); @@ -363,10 +363,10 @@ public class DashboardController extends GenericForwardComposer { } public String[] getTicks() { - Set intervals = getData().keySet(); + Set intervals = getData().keySet(); String[] result = new String[intervals.size()]; int i = 0; - for (IntegerInterval each : intervals) { + for (Interval each : intervals) { result[i++] = each.toString(); } @@ -388,7 +388,7 @@ public class DashboardController extends GenericForwardComposer { private final IDashboardModel dashboardModel; - private Map estimationAccuracyData; + private Map estimationAccuracyData; private EstimationAccuracy(IDashboardModel dashboardModel) { this.dashboardModel = dashboardModel; @@ -398,7 +398,7 @@ public class DashboardController extends GenericForwardComposer { return new EstimationAccuracy(dashboardModel); } - private Map getData() { + private Map getData() { if (estimationAccuracyData == null) { estimationAccuracyData = dashboardModel .calculateEstimationAccuracy(); @@ -407,10 +407,10 @@ public class DashboardController extends GenericForwardComposer { } public String[] getTicks() { - Set intervals = getData().keySet(); + Set intervals = getData().keySet(); String[] result = new String[intervals.size()]; int i = 0; - for (IntegerInterval each : intervals) { + for (Interval each : intervals) { result[i++] = each.toString(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java index 2ae3fc3c6..df495918b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java @@ -272,7 +272,7 @@ public class DashboardModel implements IDashboardModel { * interval */ @Override - public Map calculateTaskCompletion() { + public Map calculateTaskCompletion() { List deviations = getTaskLagDeviations(); return calculateHistogramIntervals(deviations, 6, 1); } @@ -313,14 +313,14 @@ public class DashboardModel implements IDashboardModel { * interval. */ @Override - public Map calculateEstimationAccuracy() { + public Map calculateEstimationAccuracy() { List deviations = getEstimationAccuracyDeviations(); return calculateHistogramIntervals(deviations, 6, 10); } - private Map calculateHistogramIntervals( + private Map calculateHistogramIntervals( List values, int intervalsNumber, int intervalMinimumSize) { - Map result = new LinkedHashMap(); + Map result = new LinkedHashMap(); int totalMinimumSize = intervalsNumber * intervalMinimumSize; int halfSize = totalMinimumSize / 2; @@ -390,15 +390,15 @@ public class DashboardModel implements IDashboardModel { if (deltaDecimalPart == 0 && i != (intervalsNumber - 1)) { to--; } - result.put(new IntegerInterval(from, to), Integer.valueOf(0)); + result.put(new Interval(from, to), Integer.valueOf(0)); from = to + 1; } // Construct map with number of tasks for each interval - final Set intervals = result.keySet(); + final Set intervals = result.keySet(); for (Double each : values) { - IntegerInterval interval = IntegerInterval.containingValue( + Interval interval = Interval.containingValue( intervals, each); if (interval != null) { Integer value = result.get(interval); @@ -418,18 +418,18 @@ public class DashboardModel implements IDashboardModel { return visitor.getDeviations(); } - static class IntegerInterval { + static class Interval { private int min; private int max; - public IntegerInterval(int min, int max) { + public Interval(int min, int max) { this.min = min; this.max = max; } - public static IntegerInterval containingValue( - Collection intervals, double value) { - for (IntegerInterval each : intervals) { + public static Interval containingValue( + Collection intervals, double value) { + for (Interval each : intervals) { if (each.includes(value)) { return each; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/IDashboardModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/IDashboardModel.java index 127b4f880..7c9e3cd81 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/IDashboardModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/IDashboardModel.java @@ -25,7 +25,7 @@ import java.util.Map; import org.libreplan.business.planner.entities.TaskElement; import org.libreplan.business.planner.entities.TaskStatusEnum; -import org.libreplan.web.dashboard.DashboardModel.IntegerInterval; +import org.libreplan.web.dashboard.DashboardModel.Interval; import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState; interface IDashboardModel { @@ -73,10 +73,10 @@ interface IDashboardModel { Integer getAbsoluteMarginWithDeadLine(); /* Time KPI: "Estimation accuracy" */ - Map calculateEstimationAccuracy(); + Map calculateEstimationAccuracy(); /* Time KPI: "Lead/Lag in task completion" */ - Map calculateTaskCompletion(); + Map calculateTaskCompletion(); /* Resources KPI: "Overtime Ratio" */