Рефакторинг конструкторов объектов тестирования.

src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java

@@ -1,7 +1,9 @@
 package TestingSystem.DVM.DVMTasks;
+import Common.Utils.Utils;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import TestingSystem.DVM.DVMSettings.DVMSettings;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
@@ -10,14 +12,6 @@ public class DVMCompilationTask extends DVMTask {
     @Expose
     public List<DVMRunTask> runTasks = new Vector<>();
     //-
-    public DVMCompilationTask(DVMConfiguration configuration,
-                              Group group,
-                              Test test,
-                              String flags_in
-                              ) {
-        super(configuration, group, test, flags_in);
-        maxtime = configuration.c_maxtime;
-    }
     public DVMCompilationTask() {
 
     }
@@ -30,4 +24,51 @@ public class DVMCompilationTask extends DVMTask {
         res.add(arg.toString().replace("\n", "|")); //4
         return res;
     }
+    //--
+    public static String checkFlags(String flags_in) {
+        if (!flags_in.contains("-shared-dvm")) {
+            if (flags_in.isEmpty())
+                return "-shared-dvm";
+            else return flags_in + " -shared-dvm";
+        } else
+            return flags_in;
+    }
+    public static String checkEnvironments(String environmentsSet_in) {
+        if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
+            if (environmentsSet_in.isEmpty())
+                return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
+            else
+                return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
+        } else
+            return environmentsSet_in;
+    }
+    //--
+    public DVMCompilationTask(DVMConfiguration configuration, DVMSettings dvmSettings, Group group, Test test, int kernels_in){
+        super (configuration, group, test,checkFlags(dvmSettings.flags));
+        Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
+        String checkedEnvironments = checkEnvironments(dvmSettings.environments);
+        if (dvmSettings.flags.trim().equalsIgnoreCase("-s")) {
+            runTasks.add(new DVMRunTask(
+                    configuration,
+                    dvmSettings,
+                    group,
+                    test,
+                    "",
+                    flags,
+                    checkedEnvironments,
+                    kernels_in
+            ));
+        } else
+            for (String matrix : matrixes) {
+                runTasks.add(new DVMRunTask(
+                        configuration,
+                        dvmSettings,
+                        group,
+                        test,
+                        matrix,
+                        flags,
+                        checkedEnvironments,
+                        kernels_in));
+            }
+    }
 }