From 174bc344a4a1d753b1323097bec2ee1683c6a4f9 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 14 Mar 2025 20:54:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D1=8D=D1=82=D0=B0=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2,=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BE=D1=82=D1=81=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B6=D0=B8=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BB=D0=B8=20=D1=83=D0=B6=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=82=D0=B5=D1=81=D1=82=D0=B0.=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D1=8E=D1=82=20=D1=81?=
 =?UTF-8?q?=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20=D0=BD=D0=B0=20=D0=B5=D0=B5=20?=
 =?UTF-8?q?=D0=B8=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 ----
 properties                                    |  2 +-
 .../DVM/DVMPackage/DVMPackage.java            | 54 +++++++++++++------
 .../DVM/DVMTasks/DVMRunTask.java              |  6 +--
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 503e42bb..5acc1189 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,17 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 406dd1f1..efd175d1 100644
--- a/properties
+++ b/properties
@@ -30,7 +30,7 @@
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": false,
   "CompleteRunEnvironments": false,
-  "CreateEthalonTasks": true,
+  "CreateEthalonTasks": false,
   "ErasePackageWorkspace": true,
   "lastMachineId": 28,
   "lastUserId": 36,
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index df35e2bd..38973916 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -15,6 +15,7 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.Test.Test;
+import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
@@ -75,18 +76,17 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
             DVMConfigurationCache cache = (DVMConfigurationCache) VisualCaches.GetCache(configuration);
             for (Group group : cache.getGroups()) {
                 for (Test test : cache.getGroupTests(group)) {
+                    //--
+                    DVMCompilationTask compilationTask = null;
+                    DVMRunTask runTask = null;
+                    Vector<DVMRunTask> testRunTasks = new Vector<>(); //для выставления эталона
+                    DVMRunTask ethalon = null; //эталон. последовательная задача -s без окружения и матрицы.
+                    //--
                     for (DVMSettings dvmSettings : cache.getSettings()) {
                         //---
                         DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
                         Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
                         //--
-                        /*
-                        if (Global.normalProperties.CreateEthalonTasks){
-                            params.insertElementAt(new Pair<>("-s", ""),0);
-                        }
-                         */
-                        //--
-                        //---
                         for (Pair<String, String> p : params) {
                             //--
                             String options_ = Global.normalProperties.CompleteCompilationOptions ?
@@ -94,18 +94,16 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                             String environments_ = Global.normalProperties.CompleteRunEnvironments ?
                                     completeEnvironments(p.getValue()) : p.getValue();
                             //--
-                            DVMCompilationTask compilationTask =
-                                    new DVMCompilationTask(index,configuration, options_, group, test);
-                            compilationTasks.add(compilationTask);
+                            compilationTasks.add(compilationTask = new DVMCompilationTask(index, configuration, options_, group, test));
                             //--
-                            DVMRunTask ethalon=null;
                             Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
                             if (p.getKey().trim().equalsIgnoreCase("-s")) {
-                                compilationTask.runTasks.add(new DVMRunTask(
+                                compilationTask.runTasks.add(runTask = new DVMRunTask(
                                         index,
                                         compilationTask,
                                         configuration,
-                                        dvmSettings,
+                                        dvmSettings.cube,
+                                        dvmSettings.getParamsText(),
                                         group,
                                         test,
                                         "",
@@ -113,25 +111,51 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                         environments_,
                                         kernels
                                 ));
+                                testRunTasks.add(runTask);
+                                if (ethalon == null) ethalon = runTask;
                             } else {
                                 for (String matrix : matrixes) {
-                                    compilationTask.runTasks.add(new DVMRunTask(
+                                    compilationTask.runTasks.add(runTask = new DVMRunTask(
                                             index,
                                             compilationTask,
                                             configuration,
-                                            dvmSettings,
+                                            dvmSettings.cube,
+                                            dvmSettings.getParamsText(),
                                             group,
                                             test,
                                             matrix,
                                             options_,
                                             environments_,
                                             kernels));
+                                    testRunTasks.add(runTask);
                                 }
                             }
                             //--
                             tasksCount += compilationTask.runTasks.size();
                         }
                     }
+                    //---
+                    if (Global.normalProperties.CreateEthalonTasks && group.type.equals(TestType.Correctness)) {
+                        if (ethalon == null) {
+                            compilationTasks.add(compilationTask = new DVMCompilationTask(index, configuration, "-s", group, test));
+                            compilationTask.runTasks.add(ethalon= new DVMRunTask(
+                                    index,
+                                    compilationTask,
+                                    configuration,
+                                    0,
+                                    "Is_DVM_STAT=0",
+                                    group,
+                                    test,
+                                    "",
+                                    "-s", "",
+                                    kernels));
+                            tasksCount ++;
+                        }
+                        //--
+                        for (DVMRunTask dvmRunTask: testRunTasks) {
+                            dvmRunTask.ethalon_id = ethalon.id;
+                        }
+                    }
                 }
             }
         }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
index 181a209a..d1f1a8a9 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
@@ -43,7 +43,7 @@ public class DVMRunTask extends DVMTask {
     public double compilation_time = 0.0;
     public DVMRunTask(Index index,
                       DVMCompilationTask dvmCompilationTask,
-                      DVMConfiguration configuration, DVMSettings settings,
+                      DVMConfiguration configuration, int cube_in, String paramsText_in,
                       Group group, Test test,
                       String matrix_in, String flags_in,
                       String environments_in,
@@ -56,10 +56,10 @@ public class DVMRunTask extends DVMTask {
         compilation_maxtime = configuration.c_maxtime;
         compilation_state = TaskState.Waiting;
         //инфа о запуске
-        cube = settings.cube;
+        cube = cube_in;
+        usr_par = paramsText_in;
         maxtime = configuration.maxtime;
         environments = environments_in;
-        usr_par = settings.getParamsText();
         args = test.args;
         //---------
         matrix = matrix_in;