ItEr37S17CUCalculoValorGanadoItEr36S19: Defining the indictaors for earned value chart with an enum.
This commit is contained in:
Manuel Rego Casasnovas
Javier Moran Rua
parent
4aa48d01ca
commit
ea8ef0fc60
3 changed files with 132 additions and 41 deletions
|
|
@ -20,9 +20,13 @@
|
|||
|
||||
package org.navalplanner.web.planner.chart;
|
||||
|
||||
import static org.navalplanner.web.I18nHelper._;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.SortedMap;
|
||||
import java.util.TreeMap;
|
||||
|
||||
|
|
@ -38,17 +42,38 @@ import org.zkoss.ganttz.util.Interval;
|
|||
*/
|
||||
public abstract class EarnedValueChartFiller extends ChartFiller {
|
||||
|
||||
protected SortedMap<LocalDate, BigDecimal> bcws;
|
||||
protected SortedMap<LocalDate, BigDecimal> acwp;
|
||||
protected SortedMap<LocalDate, BigDecimal> bcwp;
|
||||
protected SortedMap<LocalDate, BigDecimal> cv;
|
||||
protected SortedMap<LocalDate, BigDecimal> sv;
|
||||
protected SortedMap<LocalDate, BigDecimal> bac;
|
||||
protected SortedMap<LocalDate, BigDecimal> eac;
|
||||
protected SortedMap<LocalDate, BigDecimal> vac;
|
||||
protected SortedMap<LocalDate, BigDecimal> etc;
|
||||
protected SortedMap<LocalDate, BigDecimal> cpi;
|
||||
protected SortedMap<LocalDate, BigDecimal> spi;
|
||||
public enum EarnedValueType {
|
||||
|
||||
BCWS(_("BCWS"), _("Budgeted Cost Work Scheduled")), ACWP(_("ACWP"),
|
||||
_("Actual Cost Work Performed")), BCWP(_("BCWP"),
|
||||
_("Budgeted Cost Work Performed")), CV(_("CV"),
|
||||
_("Cost Variance")), SV(_("SV"), _("Schedule Variance")), BAC(
|
||||
_("BAC"), _("Budget At Completion")), EAC(_("EAC"),
|
||||
_("Estimate At Completion")), VAC(_("VAC"),
|
||||
_("Variance At Completion")), ETC(_("ETC"),
|
||||
_("Estimate To Complete")), CPI(_("CPI"),
|
||||
_("Cost Performance Index")), SPI(_("SPI"),
|
||||
_("Schedule Performance Index"))
|
||||
;
|
||||
|
||||
private String acronym;
|
||||
private String name;
|
||||
|
||||
private EarnedValueType(String acronym, String name) {
|
||||
this.acronym = acronym;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getAcronym() {
|
||||
return acronym;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
protected Map<EarnedValueType, SortedMap<LocalDate, BigDecimal>> indicators = new HashMap<EarnedValueType, SortedMap<LocalDate, BigDecimal>>();
|
||||
|
||||
protected abstract void calculateBudgetedCostWorkScheduled(Interval interval);
|
||||
protected abstract void calculateActualCostWorkPerformed(Interval interval);
|
||||
|
|
@ -89,32 +114,58 @@ public abstract class EarnedValueChartFiller extends ChartFiller {
|
|||
|
||||
private void calculateCostVariance() {
|
||||
// CV = BCWP - ACWP
|
||||
cv = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> cv = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bcwp = indicators
|
||||
.get(EarnedValueType.BCWP);
|
||||
SortedMap<LocalDate, BigDecimal> acwp = indicators
|
||||
.get(EarnedValueType.ACWP);
|
||||
|
||||
for (LocalDate day : bcwp.keySet()) {
|
||||
cv.put(day, bcwp.get(day).subtract(acwp.get(day)));
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.CV, cv);
|
||||
}
|
||||
|
||||
private void calculateScheduleVariance() {
|
||||
// SV = BCWP - BCWS
|
||||
sv = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> sv = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bcwp = indicators
|
||||
.get(EarnedValueType.BCWP);
|
||||
SortedMap<LocalDate, BigDecimal> bcws = indicators
|
||||
.get(EarnedValueType.BCWS);
|
||||
|
||||
for (LocalDate day : bcwp.keySet()) {
|
||||
sv.put(day, bcwp.get(day).subtract(bcws.get(day)));
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.SV, sv);
|
||||
}
|
||||
|
||||
private void calculateBudgetAtCompletion() {
|
||||
// BAC = max (BCWS)
|
||||
bac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bcws = indicators
|
||||
.get(EarnedValueType.BCWS);
|
||||
|
||||
BigDecimal value = Collections.max(bcws.values());
|
||||
for (LocalDate day : bcws.keySet()) {
|
||||
bac.put(day, value);
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.BAC, bac);
|
||||
}
|
||||
|
||||
private void calculateEstimateAtCompletion() {
|
||||
// EAC = (ACWP/BCWP) * BAC
|
||||
eac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> eac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> acwp = indicators
|
||||
.get(EarnedValueType.ACWP);
|
||||
SortedMap<LocalDate, BigDecimal> bcwp = indicators
|
||||
.get(EarnedValueType.BCWP);
|
||||
SortedMap<LocalDate, BigDecimal> bac = indicators
|
||||
.get(EarnedValueType.BAC);
|
||||
|
||||
for (LocalDate day : acwp.keySet()) {
|
||||
BigDecimal value = BigDecimal.ZERO;
|
||||
if (bcwp.get(day).compareTo(BigDecimal.ZERO) != 0) {
|
||||
|
|
@ -123,27 +174,48 @@ public abstract class EarnedValueChartFiller extends ChartFiller {
|
|||
}
|
||||
eac.put(day, value);
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.EAC, eac);
|
||||
}
|
||||
|
||||
private void calculateVarianceAtCompletion() {
|
||||
// VAC = BAC - EAC
|
||||
vac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> vac = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bac = indicators
|
||||
.get(EarnedValueType.BAC);
|
||||
SortedMap<LocalDate, BigDecimal> eac = indicators
|
||||
.get(EarnedValueType.EAC);
|
||||
|
||||
for (LocalDate day : bac.keySet()) {
|
||||
vac.put(day, bac.get(day).subtract(eac.get(day)));
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.VAC, vac);
|
||||
}
|
||||
|
||||
private void calculateEstimatedToComplete() {
|
||||
// ETC = EAC - ACWP
|
||||
etc = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> etc = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> eac = indicators
|
||||
.get(EarnedValueType.EAC);
|
||||
SortedMap<LocalDate, BigDecimal> acwp = indicators
|
||||
.get(EarnedValueType.ACWP);
|
||||
|
||||
for (LocalDate day : eac.keySet()) {
|
||||
etc.put(day, eac.get(day).subtract(acwp.get(day)));
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.ETC, etc);
|
||||
}
|
||||
|
||||
private void calculateCostPerformanceIndex() {
|
||||
// CPI = BCWP / ACWP
|
||||
cpi = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> cpi = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bcwp = indicators
|
||||
.get(EarnedValueType.BCWP);
|
||||
SortedMap<LocalDate, BigDecimal> acwp = indicators
|
||||
.get(EarnedValueType.ACWP);
|
||||
|
||||
for (LocalDate day : bcwp.keySet()) {
|
||||
BigDecimal value = BigDecimal.ZERO;
|
||||
if (acwp.get(day).compareTo(BigDecimal.ZERO) != 0) {
|
||||
|
|
@ -151,11 +223,18 @@ public abstract class EarnedValueChartFiller extends ChartFiller {
|
|||
}
|
||||
cpi.put(day, value);
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.CPI, cpi);
|
||||
}
|
||||
|
||||
private void calculateSchedulePerformanceIndex() {
|
||||
// SPI = BCWP / BCWS
|
||||
spi = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> spi = new TreeMap<LocalDate, BigDecimal>();
|
||||
SortedMap<LocalDate, BigDecimal> bcwp = indicators
|
||||
.get(EarnedValueType.BCWP);
|
||||
SortedMap<LocalDate, BigDecimal> bcws = indicators
|
||||
.get(EarnedValueType.BCWS);
|
||||
|
||||
for (LocalDate day : bcwp.keySet()) {
|
||||
BigDecimal value = BigDecimal.ZERO;
|
||||
if (bcws.get(day).compareTo(BigDecimal.ZERO) != 0) {
|
||||
|
|
@ -163,6 +242,8 @@ public abstract class EarnedValueChartFiller extends ChartFiller {
|
|||
}
|
||||
spi.put(day, value);
|
||||
}
|
||||
|
||||
indicators.put(EarnedValueType.SPI, spi);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -538,11 +538,16 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
|||
|
||||
calculateValues(interval);
|
||||
|
||||
Plotinfo bcws = createPlotInfo(this.bcws, interval, "0000FF");
|
||||
Plotinfo acwp = createPlotInfo(this.acwp, interval, "FF0000");
|
||||
Plotinfo bcwp = createPlotInfo(this.bcwp, interval, "00FF00");
|
||||
Plotinfo cv = createPlotInfo(this.cv, interval, "FFFF00");
|
||||
Plotinfo sv = createPlotInfo(this.sv, interval, "00FFFF");
|
||||
Plotinfo bcws = createPlotInfo(
|
||||
indicators.get(EarnedValueType.BCWS), interval, "0000FF");
|
||||
Plotinfo acwp = createPlotInfo(
|
||||
indicators.get(EarnedValueType.ACWP), interval, "FF0000");
|
||||
Plotinfo bcwp = createPlotInfo(
|
||||
indicators.get(EarnedValueType.BCWP), interval, "00FF00");
|
||||
Plotinfo cv = createPlotInfo(indicators.get(EarnedValueType.CV),
|
||||
interval, "FFFF00");
|
||||
Plotinfo sv = createPlotInfo(indicators.get(EarnedValueType.SV),
|
||||
interval, "00FFFF");
|
||||
|
||||
ValueGeometry valueGeometry = getValueGeometry();
|
||||
TimeGeometry timeGeometry = getTimeGeometry(interval);
|
||||
|
|
@ -570,16 +575,16 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
|||
}
|
||||
|
||||
estimatedCost = accumulateResult(estimatedCost);
|
||||
bcws = calculatedValueForEveryDay(estimatedCost, interval
|
||||
.getStart(), interval.getFinish());
|
||||
indicators.put(EarnedValueType.BCWS, calculatedValueForEveryDay(
|
||||
estimatedCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
protected void calculateActualCostWorkPerformed(Interval interval) {
|
||||
SortedMap<LocalDate, BigDecimal> workReportCost = getWorkReportCost();
|
||||
|
||||
workReportCost = accumulateResult(workReportCost);
|
||||
acwp = calculatedValueForEveryDay(workReportCost, interval
|
||||
.getStart(), interval.getFinish());
|
||||
indicators.put(EarnedValueType.ACWP, calculatedValueForEveryDay(
|
||||
workReportCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
private SortedMap<LocalDate, BigDecimal> getWorkReportCost() {
|
||||
|
|
@ -619,8 +624,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
|||
}
|
||||
|
||||
advanceCost = accumulateResult(advanceCost);
|
||||
bcwp = calculatedValueForEveryDay(advanceCost, interval.getStart(),
|
||||
interval.getFinish());
|
||||
indicators.put(EarnedValueType.BCWP, calculatedValueForEveryDay(
|
||||
advanceCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -603,11 +603,16 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
calculateValues(interval);
|
||||
|
||||
Plotinfo bcws = createPlotInfo(this.bcws, interval, "0000FF");
|
||||
Plotinfo acwp = createPlotInfo(this.acwp, interval, "FF0000");
|
||||
Plotinfo bcwp = createPlotInfo(this.bcwp, interval, "00FF00");
|
||||
Plotinfo cv = createPlotInfo(this.cv, interval, "FFFF00");
|
||||
Plotinfo sv = createPlotInfo(this.sv, interval, "00FFFF");
|
||||
Plotinfo bcws = createPlotInfo(
|
||||
indicators.get(EarnedValueType.BCWS), interval, "0000FF");
|
||||
Plotinfo acwp = createPlotInfo(
|
||||
indicators.get(EarnedValueType.ACWP), interval, "FF0000");
|
||||
Plotinfo bcwp = createPlotInfo(
|
||||
indicators.get(EarnedValueType.BCWP), interval, "00FF00");
|
||||
Plotinfo cv = createPlotInfo(indicators.get(EarnedValueType.CV),
|
||||
interval, "FFFF00");
|
||||
Plotinfo sv = createPlotInfo(indicators.get(EarnedValueType.SV),
|
||||
interval, "00FFFF");
|
||||
|
||||
ValueGeometry valueGeometry = getValueGeometry();
|
||||
TimeGeometry timeGeometry = getTimeGeometry(interval);
|
||||
|
|
@ -637,16 +642,16 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
}
|
||||
|
||||
estimatedCost = accumulateResult(estimatedCost);
|
||||
bcws = calculatedValueForEveryDay(estimatedCost, interval
|
||||
.getStart(), interval.getFinish());
|
||||
indicators.put(EarnedValueType.BCWS, calculatedValueForEveryDay(
|
||||
estimatedCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
protected void calculateActualCostWorkPerformed(Interval interval) {
|
||||
SortedMap<LocalDate, BigDecimal> workReportCost = getWorkReportCost();
|
||||
|
||||
workReportCost = accumulateResult(workReportCost);
|
||||
acwp = calculatedValueForEveryDay(workReportCost, interval
|
||||
.getStart(), interval.getFinish());
|
||||
indicators.put(EarnedValueType.ACWP, calculatedValueForEveryDay(
|
||||
workReportCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
public SortedMap<LocalDate, BigDecimal> getWorkReportCost() {
|
||||
|
|
@ -688,8 +693,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
}
|
||||
|
||||
advanceCost = accumulateResult(advanceCost);
|
||||
bcwp = calculatedValueForEveryDay(advanceCost, interval.getStart(),
|
||||
interval.getFinish());
|
||||
indicators.put(EarnedValueType.BCWP, calculatedValueForEveryDay(
|
||||
advanceCost, interval.getStart(), interval.getFinish()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue