Changeset 710 for DCWoRMS/trunk/src/test/article

Timestamp:

12/20/12 17:25:19 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/test/article/recs/utils

Files:

• AppType.java (modified) (1 diff)
• TaskToApp.java (modified) (2 diffs)

DCWoRMS/trunk/src/test/article/recs/utils/AppType.java

@@ -2 +2 @@
 
 public enum AppType {
+        abinit,
+        c_ray,
         tar,
         lin_tiny,
         lin_3gb,
-        lin_1gb,
         fft;
 }

DCWoRMS/trunk/src/test/article/recs/utils/TaskToApp.java

@@ -9 +9 @@
 public class TaskToApp {
         
-        private static int TAR = 20;
-        private static int LIN_TINY = 40;
-        private static int LIN_3GB = 60;
-        private static int LIN_1GB = 80;
+        private static int ABINIT = 20;
+        private static int C_RAY = 40;
+        private static int TAR = 60;
+        private static int LIN_3GB = 70;
+        private static int LIN_TINY = 80;
         private static int FFT = 100;
         private static Random rand = new Random(5);
@@ -30 +31 @@
                 AppType appType = null;
                 int n = rand.nextInt(100);
-                if(n < TAR){
+                if(n < ABINIT) {
+                        appType = AppType.abinit;
+                }else if(n < C_RAY){
+                        appType = AppType.c_ray;
+                }else if(n < TAR){
                         appType = AppType.tar;
+                } else if (n < LIN_3GB){
+                        appType = AppType.lin_3gb;
                 } else if (n < LIN_TINY){
                         appType = AppType.lin_tiny;
-                } else if (n < LIN_3GB){
-                        appType = AppType.lin_3gb;
-                } else if (n < LIN_1GB){
-                        appType = AppType.lin_1gb;
                 } else if (n < FFT){
                         appType = AppType.fft;