From 204d4ceca0bba7cea713e84fb9acb7f20b2eda7c Mon Sep 17 00:00:00 2001 From: 02090095 Date: Thu, 14 Dec 2023 21:14:36 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BA=D1=80=D0=B8?= =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BD?= =?UTF-8?q?=D0=B8=D1=82=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.=20=D0=B2=20json=20=D0=B8=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=8B=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D0=B5=D0=BA=D0=B0=D0=BB=D0=B8=D1=81=D1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java | 7 ++++--- src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java index f095b0b0..f9daee31 100644 --- a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java +++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java @@ -9,9 +9,10 @@ import java.util.List; import java.util.Vector; public class DVMPackage_json implements Serializable { @Expose - public int max_compilation_task_id = 0; - @Expose - public int max_run_task_id = 0; + public int max_task_id = 0; @Expose public List compilationTasks = new Vector<>(); + public int getMaxTaskId(){ + return max_task_id++; + } } diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java index c7d6886c..f0f53a57 100644 --- a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java +++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java @@ -153,12 +153,12 @@ public class AddTasksToDVMPackage extends Pass_2021 { //инициализируем идентификаторы задач. for (DVMCompilationTask compilationTask : tasks) { //-- - compilationTask.id = json.max_compilation_task_id; - json.max_compilation_task_id++; + compilationTask.id = json.max_task_id; + json.max_task_id++; //- for (DVMRunTask runTask : compilationTask.runTasks) { - runTask.id = json.max_run_task_id; - json.max_run_task_id++; + runTask.id = json.max_task_id; + json.max_task_id++; runTask.dvmcompilationtask_id = compilationTask.id; } }