Changeset 1374 for DCWoRMS/branches/coolemall/src/simulator

Timestamp:

06/05/14 15:24:38 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/simulator

Files:

• reader/ResourceReader.java (modified) (1 diff)
• stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

@@ -376 +376 @@
                         for(String resourceName : resIdList){
                                 ComputingResource computingResource;
-                                try {
-                                        if(mainCompRes.getFullName().contains(resourceName))
-                                                computingResource = mainCompRes;
-                                        else
-                                                computingResource = mainCompRes.getDescendantByName(resourceName);
-                                } catch (ResourceException e) {
-                                        continue;
-                                }
+
+                                if(mainCompRes.getFullName().contains(resourceName))
+                                        computingResource = mainCompRes;
+                                else
+                                        computingResource = mainCompRes.getDescendantByName(resourceName);
+
                                 if(computingResource != null)
                                 {

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -955 +955 @@
                 int cnt = 0;
                 for(String resName: basicStats.keySet()){
-                        try {
-                                if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
-                                        createResourceLoadData(usageStats, basicStats.get(resName));
-                                        cnt++;
-                                }
-                        } catch (ResourceException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
+
+                        if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
+                                createResourceLoadData(usageStats, basicStats.get(resName));
+                                cnt++;
                         }
                 }
@@ -1593 +1589 @@
                 for(String resName: peLoad.keySet()){
 
-                        try {
-                                if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
-                                        Double load = peLoad.get(resName);
-                                        sum += load;
-                                        peCnt++;
-                                }
-                        } catch (ResourceException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
+                        if(resource.getDescendantByName(resName) != null || resource.getFullName().compareTo(resName) == 0){
+                                Double load = peLoad.get(resName);
+                                sum += load;
+                                peCnt++;
                         }
                 }