Changeset 186 for xssim/trunk/src

Timestamp:

03/26/12 12:01:13 (13 years ago)

Author:

wojtekp

Message:

 

Location:

xssim/trunk/src/test/rewolucja/resources/physical/implementation

Files:

• CPU.java (modified) (1 diff)
• ComputingNode.java (modified) (4 diffs)

xssim/trunk/src/test/rewolucja/resources/physical/implementation/CPU.java

@@ -41 +41 @@
         
         public int getMIPS(){
-                return getProcessorSpeed().getAmount();
+                return getSpeedUnit().getAmount();
         }
         
         public int getAvailableMIPS(){
-                return getProcessorSpeed().getFreeAmount();
+                return getSpeedUnit().getFreeAmount();
         }
 
-        protected CpuSpeed getProcessorSpeed(){
+        private CpuSpeed getSpeedUnit(){
                 return (CpuSpeed) getResourceCharacteristic().getResourceUnit(ResourceParameterName.CPUSPEED);
         }

xssim/trunk/src/test/rewolucja/resources/physical/implementation/ComputingNode.java

@@ -12 +12 @@
 import test.rewolucja.extensions.ExtensionType;
 import test.rewolucja.resources.Category;
-import test.rewolucja.resources.ResourceCharacteristics;
 import test.rewolucja.resources.ResourceStatus;
 import test.rewolucja.resources.ResourceType;
@@ -80 +79 @@
         //MEMORY 
         public int getFreeMemory() {
-                return getMemory().getFreeAmount();
+                return getMemoryUnit().getFreeAmount();
         }
         
         public int getTotalMemory() {
-                return getMemory().getAmount();
+                return getMemoryUnit().getAmount();
         }
 
@@ -93 +92 @@
         }
         
-        public Memory getMemory () {
+        public Memory getMemoryUnit() {
                 return (Memory)resourceCharacteristic.getResourceUnit(ResourceParameterName.MEMORY);
         }
@@ -99 +98 @@
         //COST
         public int getProcessingCost() {
-                return getCost().getAmount();
+                return getCostUnit().getAmount();
         }
         
-        protected Cost getCost() {
+        private Cost getCostUnit() {
                 return (Cost) getResourceCharacteristic().getResourceUnit(ResourceParameterName.COST);
         }