From ce68cdd29452160413d72a31cfd15d2330bdaad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 20 Dec 2009 23:12:02 +0100 Subject: [PATCH] ItEr39S16CUConfiguracionMaquinasItEr35S09: Adding methods to compute some properties of the derived allocation --- .../planner/entities/DerivedAllocation.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedAllocation.java index df78e0681..2068719f8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DerivedAllocation.java @@ -19,6 +19,7 @@ */ package org.navalplanner.business.planner.entities; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -28,8 +29,8 @@ import org.apache.commons.lang.Validate; import org.hibernate.validator.NotNull; import org.joda.time.LocalDate; import org.navalplanner.business.common.BaseEntity; -import org.navalplanner.business.resources.entities.Machine; import org.navalplanner.business.resources.entities.MachineWorkersConfigurationUnit; +import org.navalplanner.business.resources.entities.Resource; /** * @author Óscar González Fernández @@ -59,6 +60,11 @@ public class DerivedAllocation extends BaseEntity { return true; } + public static DerivedAllocation create(ResourceAllocation derivedFrom, + MachineWorkersConfigurationUnit configurationUnit) { + return create(new DerivedAllocation(derivedFrom, configurationUnit)); + } + @NotNull private ResourceAllocation derivedFrom; @@ -67,9 +73,21 @@ public class DerivedAllocation extends BaseEntity { private Set assignments; - public static DerivedAllocation create(ResourceAllocation derivedFrom, - MachineWorkersConfigurationUnit configurationUnit) { - return create(new DerivedAllocation(derivedFrom, configurationUnit)); + public BigDecimal getAlpha() { + return configurationUnit.getAlpha(); + } + + public List getResources() { + return new ArrayList(DayAssignment + .getAllResources(assignments)); + } + + public int getHours() { + return DayAssignment.sum(assignments); + } + + public String getName() { + return configurationUnit.getName(); } /** @@ -111,7 +129,6 @@ public class DerivedAllocation extends BaseEntity { } private void checkIsValid(DerivedDayAssignment dayAssingment) { - Machine machine = configurationUnit.getMachine(); if (!dayAssingment.getAllocation().equals(this)) { throw new IllegalArgumentException(dayAssingment + " is related to " + dayAssingment.getAllocation()