Added more battery policies (#312)

* some updates

* Updates

* Added comments and renamed variables

* Ran Spotless

1 files changed, 2 insertions, 14 deletions

diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
index aa2c13b9..1fb9c6a2 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
+++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java
@@ -148,8 +148,6 @@ public final class ComputeService implements AutoCloseable {
      */
     private final Map<UUID, ServiceTask> taskById = new HashMap<>();
 
-    private final List<ServiceTask> tasks = new ArrayList<>();
-
     private final List<ServiceTask> tasksToRemove = new ArrayList<>();
 
     private ComputeMetricReader metricReader;
@@ -265,8 +263,8 @@ public final class ComputeService implements AutoCloseable {
     /**
      * Return the {@link ServiceTask}s hosted by this service.
      */
-    public List<ServiceTask> getTasks() {
-        return Collections.unmodifiableList(tasks);
+    public Map<UUID, ServiceTask> getTasks() {
+        return taskById;
     }
 
     /**
@@ -433,7 +431,6 @@ public final class ComputeService implements AutoCloseable {
     void delete(ServiceTask task) {
         completedTasks.remove(task);
         taskById.remove(task.getUid());
-        tasks.remove(task);
     }
 
     /**
@@ -452,7 +449,6 @@ public final class ComputeService implements AutoCloseable {
      * Run a single scheduling iteration.
      */
     private void doSchedule() {
-        // reorder tasks
 
         for (Iterator<SchedulingRequest> iterator = taskQueue.iterator();
                 iterator.hasNext();
@@ -660,7 +656,6 @@ public final class ComputeService implements AutoCloseable {
             ServiceTask task = new ServiceTask(service, uid, name, internalFlavor, workload, meta);
 
             service.taskById.put(uid, task);
-            service.tasks.add(task);
 
             service.tasksTotal++;
 
@@ -675,13 +670,6 @@ public final class ComputeService implements AutoCloseable {
             return service.taskById.get(id);
         }
 
-        @NotNull
-        public List<ServiceTask> queryTasks() {
-            checkOpen();
-
-            return new ArrayList<>(service.tasks);
-        }
-
         public void close() {
             isClosed = true;
         }