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

---
 .idea/workspace.xml                           |   5 +-
 .../GlobalData/Tasks/TaskState.java           |   6 +
 .../Passes/All/RefreshDVMPackageResults.java  |  68 +---------
 .../DVM/DVMPackage/DVMPackage.java            | 117 +++++++++++++++++-
 .../TestingSystem/DVM/DVMTestingPlanner.java  |  20 ---
 .../DVM/RemoteDVMTestingPlanner.java          |  81 +-----------
 6 files changed, 126 insertions(+), 171 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5acc1189..b62b6b0d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +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$/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/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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/GlobalData/Tasks/TaskState.java b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
index f498b276..a36ffd1c 100644
--- a/src/_VisualDVM/GlobalData/Tasks/TaskState.java
+++ b/src/_VisualDVM/GlobalData/Tasks/TaskState.java
@@ -21,6 +21,7 @@ public enum TaskState implements StatusEnum {
     WrongTestFormat,
     InternalError,
     Done,
+    DoneWithDiffs,
     //--- сугубо кластерные.
     Queued,
     NoSuchTask,
@@ -38,6 +39,7 @@ public enum TaskState implements StatusEnum {
             case WrongTestFormat:
             case InternalError:
             case Crushed:
+            case DoneWithDiffs:
                 return true;
             default:
                 return false;
@@ -63,6 +65,8 @@ public enum TaskState implements StatusEnum {
                 return "прервана";
             case Done:
                 return "успешно";
+            case DoneWithDiffs:
+                return "различия с эталоном";
             case DoneWithErrors:
                 return "с ошибками";
             case Crushed:
@@ -108,6 +112,7 @@ public enum TaskState implements StatusEnum {
             case Crushed:
                 return VisualiserFonts.Fatal;
             case Finished:
+            case DoneWithDiffs:
                 return VisualiserFonts.BlueState;
             case WorkspaceReady:
                 return VisualiserFonts.ReadyState;
@@ -136,6 +141,7 @@ public enum TaskState implements StatusEnum {
     public boolean isComplete() {
         switch (this) {
             case Done:
+            case DoneWithDiffs:
             case DoneWithErrors:
             case AbortedByTimeout:
             case AbortedByUser:
diff --git a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
index d7e607fa..6ecbb004 100644
--- a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
+++ b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
@@ -42,73 +42,7 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
     }
     @Override
     protected void body() throws Exception {
-        boolean hasErrors = false;
-        target.readJson();
-        Vector<DVMRunTask> runTasks = new Vector<>();
-        for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
-            runTasks.addAll(compilationTask.runTasks);
-        //----
-        int ct_count = 0;
-        int rt_count = 0;
-        int good = 0;
-        //--
-        int i = 0;
-        for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
-            for (DVMRunTask runTask : compilationTask.runTasks) {
-                ShowProgress(runTasks.size(), i, true);
-                ++i;
-                rt_count++;
-                if (compilationTask.state != TaskState.Done) {
-                    runTask.state = TaskState.Canceled;
-                } else {
-                    File rt_workspace = Paths.get(target.getLocalWorkspace().getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
-                    if (rt_workspace.exists()) {
-                        //анализ задачи на запуск.
-                        File outFile = new File(rt_workspace, Constants.out_file);
-                        File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
-                        //--
-                        String output = FileUtils.readFileToString(outFile);
-                        String errors = FileUtils.readFileToString(errFile);
-                        //--
-                        List<String> output_lines = Arrays.asList(output.split("\n"));
-                        List<String> errors_lines = Arrays.asList(errors.split("\n"));
-                        //---
-                        if (output.trim().isEmpty()) {
-                            runTask.state = TaskState.Crushed;
-                        } else {
-                            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:
-                                        results = Utils.analyzeCorrectness(output_lines);
-                                        break;
-                                    case Performance:
-                                        results = Utils.analyzePerformance(output_lines);
-                                        break;
-                                    default:
-                                        break;
-                                }
-                                runTask.state = results.getKey();
-                                runTask.progress = results.getValue();
-                                runTask.CleanTime = Utils.parseCleanTime(output);
-                            }
-                        }
-                    }
-                }
-                if (!runTask.state.equals(TaskState.Done))
-                    hasErrors = true;
-                else good++;
-            }
-        //--
-        target.saveJson(); //запись обновленных результатов пакета в json!
-        target.doneTasksCount = good;
-        target.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
-        double percent = (((double) (good)) / target.tasksCount) * 100.0;
-        target.description = "Выполнено на " + ((int) percent) + "%\n" +
-                "Всего задач: " + target.tasksCount + ", из них с ошибками " + (target.tasksCount - good);
-        //--
+        target.checkFinishState();
     }
     @Override
     protected void performDone() throws Exception {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 38973916..11e75cd5 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -4,10 +4,12 @@ import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Compiler.Compiler;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.Machine.MachineType;
+import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
 import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
@@ -21,10 +23,19 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 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;
+import org.apache.commons.io.FileUtils;
 
 import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Vector;
 public class DVMPackage extends TestingPackage<DVMPackage_json> {
     //---
@@ -209,11 +220,111 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
     public User getUser() {
         return new User(user_name, "", user_workspace);
     }
-    @Override
-    public void checkFinishState() throws Exception {
-    }
     public String getMachineURL() {
         return machine_address + ":" + machine_port;
     }
+    //получение запакованных планировщиком результатов задач.
+    public void getTasksInfo(File packageLocalWorkspace, List<? extends DVMTask> tasks, String file_name) throws Exception {
+        LinkedHashMap<Integer, DVMTask> sorted_tasks = new LinkedHashMap<>();
+        for (DVMTask task : tasks)
+            sorted_tasks.put(task.id, task);
+        //--
+        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()) {
+                String[] data = packed.split(" ");
+                int id = Integer.parseInt(data[0]);
+                TaskState state = TaskState.valueOf(data[1]);
+                double time = Double.parseDouble(data[2]);
+                //--
+                DVMTask task = sorted_tasks.get(id);
+                task.state = state;
+                task.Time = state.equals(TaskState.AbortedByTimeout) ? (task.maxtime + 1) : time;
+            }
+        }
+    }
+    @Override
+    public void checkFinishState() throws Exception {
+        File packageLocalWorkspace = new File(Global.DVMPackagesDirectory, String.valueOf(id));
+        boolean hasErrors = false;
+        readJson();
+        Vector<DVMRunTask> runTasks = new Vector<>();
+        for (DVMCompilationTask compilationTask : package_json.compilationTasks)
+            runTasks.addAll(compilationTask.runTasks);
+        //----
+        getTasksInfo(packageLocalWorkspace,package_json.compilationTasks, "CompilationInfo.txt");
+        getTasksInfo(packageLocalWorkspace,runTasks, "RunningInfo.txt");
+        //--
+        int ct_count = 0;
+        int rt_count = 0;
+        int good = 0;
+        //--
+        for (DVMCompilationTask compilationTask : package_json.compilationTasks) {
+            compilationTask.dvm_package_id = id;
+            if (!compilationTask.state.equals(TaskState.Done))
+                hasErrors = true;
+            ct_count++;
+            File ct_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(compilationTask.id)).toFile();
+            if (ct_workspace.exists()) {
+                for (DVMRunTask runTask : compilationTask.runTasks) {
+                    runTask.dvm_package_id = id;
+                    rt_count++;
+                    runTask.compilation_state = compilationTask.state;
+                    runTask.compilation_time = compilationTask.Time;
+                    if (compilationTask.state != TaskState.Done) {
+                        runTask.state = TaskState.Canceled;
+                    } else {
+                        File rt_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
+                        if (rt_workspace.exists() && runTask.state.equals(TaskState.Finished)
+                        ) {
+                            //анализ задачи на запуск.
+                            File outFile = new File(rt_workspace, Constants.out_file);
+                            File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
+                            //--
+                            String output = FileUtils.readFileToString(outFile);
+                            String errors = FileUtils.readFileToString(errFile);
+                            //--
+                            List<String> output_lines = Arrays.asList(output.split("\n"));
+                            List<String> errors_lines = Arrays.asList(errors.split("\n"));
+                            //---
+                            if (output.trim().isEmpty()) {
+                                runTask.state = TaskState.Crushed;
+                            } else {
+                                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:
+                                            results = Utils.analyzeCorrectness(output_lines);
+                                            break;
+                                        case Performance:
+                                            results = Utils.analyzePerformance(output_lines);
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                    runTask.state = results.getKey();
+                                    runTask.progress = results.getValue();
+                                    runTask.CleanTime = Utils.parseCleanTime(output);
+                                }
+                            }
+                        }
+                    }
+                    if (!runTask.state.equals(TaskState.Done))
+                        hasErrors = true;
+                    else good++;
+                }
+            }
+        }
+        progress = 100;
+        doneTasksCount = good;
+        saveJson(); //запись обновленных результатов пакета в json!
+        state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
+        double percent = (((double) (good)) / tasksCount) * 100.0;
+        description = "Выполнено на " + ((int) percent) + "%\n" +
+                "Всего задач: " + tasksCount + ", из них с ошибками " + (tasksCount - good);
+    }
 }
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
index d192328d..5dc66eb1 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
@@ -86,26 +86,6 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         }
         return res;
     }
-    public void getTasksInfo(List<? extends DVMTask> tasks, String file_name) throws Exception {
-        LinkedHashMap<Integer, DVMTask> sorted_tasks = new LinkedHashMap<>();
-        for (DVMTask task : tasks)
-            sorted_tasks.put(task.id, task);
-        //--
-        File info_file = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", file_name).toFile();
-        List<String> lines = FileUtils.readLines(info_file, Charset.defaultCharset());
-        for (String packed : lines) {
-            if (!packed.isEmpty()) {
-                String[] data = packed.split(" ");
-                int id = Integer.parseInt(data[0]);
-                TaskState state = TaskState.valueOf(data[1]);
-                double time = Double.parseDouble(data[2]);
-                //--
-                DVMTask task = sorted_tasks.get(id);
-                task.state = state;
-                task.Time = state.equals(TaskState.AbortedByTimeout) ? (task.maxtime + 1) : time;
-            }
-        }
-    }
     @Override
     protected void Print(String message) {
         try {
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 532be27f..156a85fa 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -92,86 +92,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     }
     @Override
     protected void AnalyseResults() throws Exception {
-        boolean hasErrors = false;
-        testingPackage.readJson();
-        Print("analysing results");
-        Vector<DVMRunTask> runTasks = new Vector<>();
-        for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks)
-            runTasks.addAll(compilationTask.runTasks);
-        //----
-        getTasksInfo(testingPackage.package_json.compilationTasks, "CompilationInfo.txt");
-        getTasksInfo(runTasks, "RunningInfo.txt");
-        //--
-        int ct_count = 0;
-        int rt_count = 0;
-        int good = 0;
-        //--
-        for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
-            compilationTask.dvm_package_id = testingPackage.id;
-            if (!compilationTask.state.equals(TaskState.Done))
-                hasErrors = true;
-            ct_count++;
-            File ct_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(compilationTask.id)).toFile();
-            if (ct_workspace.exists()) {
-                for (DVMRunTask runTask : compilationTask.runTasks) {
-                    runTask.dvm_package_id = testingPackage.id;
-                    rt_count++;
-                    runTask.compilation_state = compilationTask.state;
-                    runTask.compilation_time = compilationTask.Time;
-                    if (compilationTask.state != TaskState.Done) {
-                        runTask.state = TaskState.Canceled;
-                    } else {
-                        File rt_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
-                        if (rt_workspace.exists() && runTask.state.equals(TaskState.Finished)
-                        ) {
-                            //анализ задачи на запуск.
-                            File outFile = new File(rt_workspace, Constants.out_file);
-                            File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
-                            //--
-                            String output = FileUtils.readFileToString(outFile);
-                            String errors = FileUtils.readFileToString(errFile);
-                            //--
-                            List<String> output_lines = Arrays.asList(output.split("\n"));
-                            List<String> errors_lines = Arrays.asList(errors.split("\n"));
-                            //---
-                            if (output.trim().isEmpty()) {
-                                runTask.state = TaskState.Crushed;
-                            } else {
-                                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:
-                                            results = Utils.analyzeCorrectness(output_lines);
-                                            break;
-                                        case Performance:
-                                            results = Utils.analyzePerformance(output_lines);
-                                            break;
-                                        default:
-                                            break;
-                                    }
-                                    runTask.state = results.getKey();
-                                    runTask.progress = results.getValue();
-                                    runTask.CleanTime = Utils.parseCleanTime(output);
-                                }
-                            }
-                        }
-                    }
-                    if (!runTask.state.equals(TaskState.Done))
-                        hasErrors = true;
-                    else good++;
-                }
-            }
-        }
-        testingPackage.progress = 100;
-        testingPackage.doneTasksCount = good;
-        testingPackage.saveJson(); //запись обновленных результатов пакета в json!
-        Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
-        testingPackage.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
-        double percent = (((double) (good)) / testingPackage.tasksCount) * 100.0;
-        testingPackage.description = "Выполнено на " + ((int) percent) + "%\n" +
-                "Всего задач: " + testingPackage.tasksCount + ", из них с ошибками " + (testingPackage.tasksCount - good);
+        testingPackage.checkFinishState();
         UpdatePackageState();
         //теперь удалить распакованную папку с результатами. для скачки нужен только архив.
         File unpacked_results = new File(packageLocalWorkspace.getAbsolutePath(), "results");