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

---
 .idea/workspace.xml                           |  6 +-
 properties                                    |  2 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../GlobalData/Tasks/TaskState.java           |  4 +-
 .../DVM/DVMPackage/DVMPackage.java            | 61 ++++++++++++++++---
 .../DVM/DVMTasks/UI/DVMRunTasksForm.java      |  8 +++
 src/_VisualDVM/Utils.java                     |  3 -
 7 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b62b6b0d..6121a669 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +8,11 @@
   <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/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.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/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index efd175d1..406dd1f1 100644
--- a/properties
+++ b/properties
@@ -30,7 +30,7 @@
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": false,
   "CompleteRunEnvironments": false,
-  "CreateEthalonTasks": false,
+  "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
   "lastMachineId": 28,
   "lastUserId": 36,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 8b318fc4..41b7224e 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1211;
+    public static final int version = 1212;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/GlobalData/Tasks/TaskState.java b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
index a36ffd1c..75cdfccc 100644
--- a/src/_VisualDVM/GlobalData/Tasks/TaskState.java
+++ b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
@@ -66,7 +66,7 @@ public enum TaskState implements StatusEnum {
             case Done:
                 return "успешно";
             case DoneWithDiffs:
-                return "различия с эталоном";
+                return "различия";
             case DoneWithErrors:
                 return "с ошибками";
             case Crushed:
@@ -103,6 +103,7 @@ public enum TaskState implements StatusEnum {
             case WrongTestFormat:
             case InternalError:
             case Canceled:
+            case DoneWithDiffs:
                 return VisualiserFonts.BadState;
             case Queued:
             case Running:
@@ -112,7 +113,6 @@ public enum TaskState implements StatusEnum {
             case Crushed:
                 return VisualiserFonts.Fatal;
             case Finished:
-            case DoneWithDiffs:
                 return VisualiserFonts.BlueState;
             case WorkspaceReady:
                 return VisualiserFonts.ReadyState;
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 11e75cd5..129a5edf 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -24,7 +24,6 @@ import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
-import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 import javafx.util.Pair;
@@ -149,7 +148,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                     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(
+                            compilationTask.runTasks.add(ethalon = new DVMRunTask(
                                     index,
                                     compilationTask,
                                     configuration,
@@ -160,10 +159,10 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                     "",
                                     "-s", "",
                                     kernels));
-                            tasksCount ++;
+                            tasksCount++;
                         }
                         //--
-                        for (DVMRunTask dvmRunTask: testRunTasks) {
+                        for (DVMRunTask dvmRunTask : testRunTasks) {
                             dvmRunTask.ethalon_id = ethalon.id;
                         }
                     }
@@ -229,7 +228,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         for (DVMTask task : tasks)
             sorted_tasks.put(task.id, task);
         //--
-        File info_file = Utils_.getFile(packageLocalWorkspace.getAbsolutePath(),"results", file_name);
+        File info_file = Utils_.getFile(packageLocalWorkspace.getAbsolutePath(), "results", file_name);
         List<String> lines = FileUtils.readLines(info_file, Charset.defaultCharset());
         for (String packed : lines) {
             if (!packed.isEmpty()) {
@@ -253,13 +252,16 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         for (DVMCompilationTask compilationTask : package_json.compilationTasks)
             runTasks.addAll(compilationTask.runTasks);
         //----
-        getTasksInfo(packageLocalWorkspace,package_json.compilationTasks, "CompilationInfo.txt");
-        getTasksInfo(packageLocalWorkspace,runTasks, "RunningInfo.txt");
+        getTasksInfo(packageLocalWorkspace, package_json.compilationTasks, "CompilationInfo.txt");
+        getTasksInfo(packageLocalWorkspace, runTasks, "RunningInfo.txt");
         //--
         int ct_count = 0;
         int rt_count = 0;
         int good = 0;
         //--
+        LinkedHashMap<Integer, DVMRunTask> sortedRunTasks = new LinkedHashMap<>();
+        Vector<Integer> rte_ids = new Vector<>(); //id задач у которых есть эталон.
+        //-
         for (DVMCompilationTask compilationTask : package_json.compilationTasks) {
             compilationTask.dvm_package_id = id;
             if (!compilationTask.state.equals(TaskState.Done))
@@ -267,7 +269,10 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
             ct_count++;
             File ct_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(compilationTask.id)).toFile();
             if (ct_workspace.exists()) {
+                //1 проход. анализ всех задач подряд
                 for (DVMRunTask runTask : compilationTask.runTasks) {
+                    sortedRunTasks.put(runTask.id, runTask);
+                    //--
                     runTask.dvm_package_id = id;
                     rt_count++;
                     runTask.compilation_state = compilationTask.state;
@@ -294,6 +299,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                 if (Utils.isCrushed(output_lines, errors_lines)) {
                                     runTask.state = TaskState.Crushed;
                                 } else {
+                                    //--
                                     Pair<TaskState, Integer> results = new Pair<>(TaskState.Done, 100);
                                     switch (runTask.test_type) {
                                         case Correctness:
@@ -301,23 +307,58 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
                                             break;
                                         case Performance:
                                             results = Utils.analyzePerformance(output_lines);
+                                            runTask.CleanTime = Utils.parseCleanTime(output);
                                             break;
                                         default:
                                             break;
                                     }
+                                    //---
                                     runTask.state = results.getKey();
                                     runTask.progress = results.getValue();
-                                    runTask.CleanTime = Utils.parseCleanTime(output);
                                 }
                             }
                         }
                     }
-                    if (!runTask.state.equals(TaskState.Done))
+                    if (runTask.state.equals(TaskState.Done)) {
+                        good++;
+                        if (runTask.ethalon_id != CommonConstants.Nan) rte_ids.add(runTask.id);
+                        //с эталоном сверяем только если задача выполнена
+                    } else {
                         hasErrors = true;
-                    else good++;
+                    }
                 }
             }
         }
+        //-
+        //2 проход. если у успешных задач есть эталоны.
+        for (int task_id : rte_ids) {
+            DVMRunTask runTask = sortedRunTasks.get(task_id);
+            DVMRunTask ethalon = sortedRunTasks.get(runTask.ethalon_id);
+            if (ethalon.state.equals(TaskState.Done)) {
+                //проверяем только если эталон выполнен.
+                //--------------------------------------
+                File taskOutFile = Utils_.getFile(
+                        packageLocalWorkspace.getAbsolutePath(),
+                        "results",
+                        String.valueOf(runTask.id),
+                        Constants.out_file
+                );
+                File ethalonOutFile = Utils_.getFile(
+                        packageLocalWorkspace.getAbsolutePath(),
+                        "results",
+                        String.valueOf(ethalon.id),
+                        Constants.out_file
+                );
+                String taskOut = FileUtils.readFileToString(taskOutFile);
+                String ethalonOut = FileUtils.readFileToString(ethalonOutFile);
+                if (!taskOut.equals(ethalonOut)){
+                    runTask.state = TaskState.DoneWithDiffs;
+                    hasErrors = true;
+                    good--;
+                }
+            }
+        }
+        //-
         progress = 100;
         doneTasksCount = good;
         saveJson(); //запись обновленных результатов пакета в json!
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
index e354d95e..6d4cd024 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
@@ -63,6 +63,14 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
                         return RendererStatusEnum.class;
                     }
                 },
+                /*
+                new ColumnInfo<DVMRunTask>("эталон") {
+                    @Override
+                    public Object getFieldAt(DVMRunTask object) {
+                        return object.ethalon_id;
+                    }
+                },
+                 */
                 new ColumnInfo<DVMRunTask>("Матрица") {
                     @Override
                     public Object getFieldAt(DVMRunTask object) {
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index 8aa578f5..59ecc070 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -511,9 +511,6 @@ public class Utils {
             }
         }
         TaskState state = TaskState.Finished;
-        //   if (starts == 0 || ends == 0) {
-        //       state = TaskState.WrongTestFormat;
-        //  } else
         if (errors > 0) {
             state = TaskState.DoneWithErrors;
         } else {