From a5d340d64cfcf1c9bce2de100b0608c4ab3ec5f2 Mon Sep 17 00:00:00 2001 From: Stefan Derkits Date: Tue, 21 May 2013 22:47:25 +0200 Subject: [PATCH] added one todo,small style changes --- src/at/ac/tuwien/lsdc/management/MachineManager.java | 2 +- src/at/ac/tuwien/lsdc/sched/SchedulerA.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/at/ac/tuwien/lsdc/management/MachineManager.java b/src/at/ac/tuwien/lsdc/management/MachineManager.java index 7942378..d93734b 100644 --- a/src/at/ac/tuwien/lsdc/management/MachineManager.java +++ b/src/at/ac/tuwien/lsdc/management/MachineManager.java @@ -121,7 +121,7 @@ public class MachineManager { double consumption = 0; for (PhysicalMachine pm : PMs.values()) { if (pm.isRunning()) - consumption = consumption + pm.getConsumption(); + consumption += + pm.getConsumption(); } return consumption; } diff --git a/src/at/ac/tuwien/lsdc/sched/SchedulerA.java b/src/at/ac/tuwien/lsdc/sched/SchedulerA.java index 3d6a7ff..c6bc7e2 100644 --- a/src/at/ac/tuwien/lsdc/sched/SchedulerA.java +++ b/src/at/ac/tuwien/lsdc/sched/SchedulerA.java @@ -2,15 +2,15 @@ package at.ac.tuwien.lsdc.sched; import java.io.File; import java.io.IOException; + import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Collections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; - import at.ac.tuwien.lsdc.exception.ActiveApplicationsException; import at.ac.tuwien.lsdc.types.Application; import at.ac.tuwien.lsdc.types.PhysicalMachine; @@ -124,6 +124,7 @@ public class SchedulerA extends AbstractScheduler { if (!appDeployed) log.warn("Application " + app.toString() + " could not be deployed on any pm"); + //TODO: save app in a List and try to deploy with next handled events } } -- 2.43.0