Changeset 1178 for DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling

Timestamp:

08/02/13 10:37:31 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2

Files:

• RecsIn2OutSP.java (modified) (1 diff)
• RecsOut2InSP.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java

@@ -180 +180 @@
                         Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
                         Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
-                        if (id1 > id2)
+                        if(id1 >=9 && id1 <=17 && id2 >=0 && id2<= 8)
+                                return -1;
+                        else if (id2 >=9 && id2 <=17 && id1 >=0 && id1<= 8)
                                 return 1;
-                        else if (id1 < id2)
-                                return -1;
-                        else
-                                return 0;
-
+                        else if (id1 >=9 && id1 <=17 && id2 >=9 && id2<= 17){
+                                if(id1 > id2){
+                                        return 1;
+                                } else if (id1 < id2)
+                                        return -1;
+                                else return 0;
+                        }
+                        else if (id1 >=0 && id1 <=8 && id2 >=0 && id2<= 8){
+                                if(id1 > id2){
+                                        return 1;
+                                } else if (id1 < id2)
+                                        return -1;
+                                else return 0;
+                        
+                        }else return 0;
                 }
         }

DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java

@@ -179 +179 @@
                         Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
                         Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
-                        if(id1 >=9 && id1 <=17 && id2 >=0 && id2<= 8)
+                        if (id1 > id2)
+                                return 1;
+                        else if (id1 < id2)
                                 return -1;
-                        else if (id2 >=9 && id2 <=17 && id1 >=0 && id1<= 8)
-                                return 1;
-                        else if (id1 >=9 && id1 <=17 && id2 >=9 && id2<= 17){
-                                if(id1 > id2){
-                                        return 1;
-                                } else if (id1 < id2)
-                                        return -1;
-                                else return 0;
-                        }
-                        else if (id1 >=0 && id1 <=8 && id2 >=0 && id2<= 8){
-                                if(id1 > id2){
-                                        return 1;
-                                } else if (id1 < id2)
-                                        return -1;
-                                else return 0;
-                        
-                        }else return 0;
+                        else
+                                return 0;
                 }
         }
-        
 }