Changeset 1207 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ResourceCharacteristics.java

Timestamp:

11/26/13 11:56:07 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ResourceCharacteristics.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ResourceCharacteristics.java

@@ -1 +1 @@
 package schedframe.resources.computing;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import schedframe.Parameters;
 import schedframe.resources.computing.location.Location;
-import schedframe.resources.units.ResourceUnit;
-import schedframe.resources.units.ResourceUnitName;
 
 
@@ -16 +9 @@
         private static final long serialVersionUID = 2719535186621622647L;
 
-        protected Map<ResourceUnitName, List<ResourceUnit>> resUnits;
+        protected Location location;
         protected Parameters parameters;
-        protected Location location;
+        //protected Location location;
+        //protected List<Device> devices;
 
         /*public ResourceCharacteristics(Map<ResourceUnitName, List<AbstractResourceUnit>> resUnits){
@@ -32 +26 @@
         }*/
         
-        public Map<ResourceUnitName, List<ResourceUnit>> getResourceUnits() {
-                if(resUnits == null)
-                        return new HashMap<ResourceUnitName, List<ResourceUnit>>();
-                return resUnits;
-        }
+
         
-        public ResourceUnit getResourceUnit(ResourceUnitName unitName) throws NoSuchFieldException{
-                if(getResourceUnits().containsKey(unitName))
-                        return getResourceUnits().get(unitName).get(0);
-                else throw new NoSuchFieldException("Resource unit " + unitName + 
-                                " is not available in this resource ");
-        }
-        
-        public void addResourceUnit(ResourceUnit unit){ 
-                if(resUnits == null){
-                        resUnits = new HashMap<ResourceUnitName, List<ResourceUnit>>(2);
-                }
-                List<ResourceUnit> list = null;
-                if(resUnits.containsKey(unit.getName())){
-                        list = resUnits.get(unit.getName());
-                } else {
-                        list = new ArrayList<ResourceUnit>(1);
-                        resUnits.put(unit.getName(), list);
-                }
-                list.add(unit);
-        }
-        
-        
-        public static class Builder {
-                  
-                protected Map<ResourceUnitName, List<ResourceUnit>> resUnits;
-                protected Location location;
-                protected Parameters parameters;
-                
-                public Builder location(Location loc){this.location = loc; return this; }
-        public Builder parameters(Parameters params){this.parameters = params; return this; }
-        public Builder resourceUnits(Map<ResourceUnitName, List<ResourceUnit>> units){this.resUnits = units; return this; }
-        public Builder resourceUnits(){this.resUnits = new HashMap<ResourceUnitName, List<ResourceUnit>>(2); return this; }
-        
-        public ResourceCharacteristics build() {
-            return new ResourceCharacteristics(this);
-        }
-        }
-        
-        private ResourceCharacteristics(Builder builder) {
-                this.location = builder.location;
-                this.parameters = builder.parameters;
-                this.resUnits = builder.resUnits;
-        }
-
         public Parameters getParameters() {
                 if(parameters == null)
@@ -91 +37 @@
                 return location;
         }
+        
+        protected ResourceCharacteristics(Builder<?> builder) {
+                //this.location = builder.location;
+                this.parameters = builder.parameters;
+                this.location = builder.location;
+                //this.devices = builder.devices;
+        }
+        
+    public static abstract class Builder<T extends Builder<T>> {
+          
+                protected Location location;
+                protected Parameters parameters;
+
+        public T parameters(Parameters params){this.parameters = params; return self(); }
+                public T location(Location loc){this.location = loc; return self(); }
+                
+        protected abstract T self();
+
+        public ResourceCharacteristics build() {
+            return new ResourceCharacteristics(this);
+        }
+    }
+    private static class Builder2 extends Builder<Builder2> {
+        @Override
+        protected Builder2 self() {
+            return this;
+        }
+    }
+
+    public static Builder<?> builder() {
+        return new Builder2();
+    }
+        
+        /*public static class Builder {
+                  
+                protected Map<ResourceUnitName, List<ResourceUnit>> resUnits;
+                //protected Location location;
+                protected Parameters parameters;
+                //protected List<Device> devices;
+                
+                //public Builder location(Location loc){this.location = loc; return this; }
+        public Builder parameters(Parameters params){this.parameters = params; return this; }
+        //public Builder device(List<Device> dev){this.devices = dev; return this; }
+        public Builder resourceUnits(Map<ResourceUnitName, List<ResourceUnit>> units){this.resUnits = units; return this; }
+        public Builder resourceUnits(){this.resUnits = new HashMap<ResourceUnitName, List<ResourceUnit>>(2); return this; }
+        
+        public ResourceCharacteristics build() {
+            return new ResourceCharacteristics(this);
+        }
+        }
+        */
+
 
 }