Changeset 241 for xssim/branches/tpiontek/src/test/rewolucja/resources/physical

Timestamp:

04/11/12 16:30:38 (13 years ago)

Author:

piontek

Message:

 

Location:

xssim/branches/tpiontek/src/test/rewolucja/resources/physical

Files:

• factory/ComputingNodeFactory.java (modified) (2 diffs)
• implementation/Processor.java (modified) (1 diff)

xssim/branches/tpiontek/src/test/rewolucja/resources/physical/factory/ComputingNodeFactory.java

@@ -4 +4 @@
 import schedframe.resources.units.Memory;
 import test.rewolucja.resources.Category;
-import test.rewolucja.resources.ResourceCharacteristics;
 import test.rewolucja.resources.description.ExecResourceDescription;
 import test.rewolucja.resources.physical.base.ComputingResource;
@@ -37 +36 @@
                 String resName = resDesc.getResourceId();
                 Category cat = resDesc.getCategory();
-                if(cat.getName().equals("A")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                
+                if(cat.getName().equals("A"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 8704, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else if (cat.getName().equals("B")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else if (cat.getName().equals("B"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 6144, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else if (cat.getName().equals("C")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else if (cat.getName().equals("C"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 0, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else {
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 0, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);

xssim/branches/tpiontek/src/test/rewolucja/resources/physical/implementation/Processor.java

@@ -56 +56 @@
         public void initCharacteristics(ExecResourceDescription resDesc){
                 resourceCharacteristic = new ResourceCharacteristics();
-                resourceCharacteristic.addResourceUnit(new CpuSpeed(name, 1, 0));
+                
+                int speed = 1000;
+                if( resDesc.getCategory().getName().equals("A"))
+                        speed = 2000;
+                
+                resourceCharacteristic.addResourceUnit(new CpuSpeed(name, speed, 0));
         }