From bd7778414a037d2bb1afa8ba4de4490068d8e03b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 27 Sep 2023 14:13:43 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 24 ++-------------
 .../Json/Scenario_json.java                   |  5 ++--
 .../SapforScenario/SapforScenario.java        | 11 ++++---
 .../SapforTasksPackage.java                   | 29 +++++--------------
 .../Passes/All/PerformSapforTasksPackage.java | 12 +++++---
 .../Passes/All/PerformScenario.java           | 10 +++++--
 .../Passes/All/StartSapforTests.java          |  4 +++
 7 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0245923b..d5bf9354 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/ModesSupervisors/PackageModeSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/ScenarioResults_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTaskResult.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AnalyseSapforPackageResults.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/Scenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/Scenario_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenario.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PerformScenario.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforTasksComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/Scenario_json.java b/src/SapforTestingSystem/Json/Scenario_json.java
index 72bdf526..f452d141 100644
--- a/src/SapforTestingSystem/Json/Scenario_json.java
+++ b/src/SapforTestingSystem/Json/Scenario_json.java
@@ -1,14 +1,15 @@
 package SapforTestingSystem.Json;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.google.gson.annotations.Expose;
+import javafx.util.Pair;
 
 import java.util.List;
 import java.util.Vector;
 public class Scenario_json {
-    @Expose
-    public String flags;
     @Expose
     public List<PassCode_2021> codes = new Vector<>();
     @Expose
     public List<String> tests = new Vector<>();
+    @Expose
+    public List<Pair<String,String>> packages= new Vector<>(); //пары пакеты + флаги
 }
diff --git a/src/SapforTestingSystem/SapforScenario/SapforScenario.java b/src/SapforTestingSystem/SapforScenario/SapforScenario.java
index 7776b554..0f0e6eff 100644
--- a/src/SapforTestingSystem/SapforScenario/SapforScenario.java
+++ b/src/SapforTestingSystem/SapforScenario/SapforScenario.java
@@ -1,19 +1,18 @@
 package SapforTestingSystem.SapforScenario;
-import Common.Current;
 import Common.Database.iDBObject;
 import TestingSystem.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 public class SapforScenario extends iDBObject {
     @Description("DEFAULT ''")
-    public String passesNames = ""; //имена преобразований через ;
+    public String passesNames = ""; //переведенные имена преобразований через ; для отображения
     @Description("DEFAULT ''")
-    public String testsNames = "";//имена тестов через ;
+    public String testsNames = "";//имена тестов через ; для отображения
     //---
-    public String sapfor_version = "?";
+    public String sapfor_version = "?"; //тестируемая версия SAPFOR
     //---
-    public String workspace = "";
+    public String workspace = ""; //домашняя папка
     //---
-    public int tasksCount = 0;
+    public int tasksCount = 0; //Общее число задач
     //---
     public double Time; //время выполнения.
     public long StartDate = 0; //дата начала выполнения
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 7ade985b..e8d8bd77 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -11,45 +11,30 @@ import com.sun.org.glassfish.gmbal.Description;
 import java.util.Vector;
 public class SapforTasksPackage extends iDBObject {
     public int sapforscenario_id = Utils.Nan;
-    //----
-    public int FREE_FORM = 0; //"Свободный выходной стиль"; -f90
-    public int STATIC_SHADOW_ANALYSIS = 0;//"Оптимизация теневых обменов"; -sh
-    public int MAX_SHADOW_WIDTH = 50; // "Максимальный размер теневых граней"; (%) -shwidth значение поля
-    public int STATIC_PRIVATE_ANALYSIS = 0; //"Статический анализ приватностей" -priv
-    public int KEEP_SPF_DIRECTIVES = 0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
-    public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM
+    @Description("DEFAULT ''")
+    public String sapforconfiguration_id = "";
     //---
     @Description("DEFAULT ''")
     public String flags = "";
     @Description("DEFAULT 0")
     public int versions_tree_built = 0;
-    @Description("DEFAULT ''")
-    public String sapforconfiguration_id = "";
+    //--
+    @Description("IGNORE")
+    public Vector<Test> tests = null;
+    @Description("IGNORE")
+    public Vector<PassCode_2021> codes = null;
     //--
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         SapforTasksPackage tasksPackage = (SapforTasksPackage) src;
-        //---
         flags = tasksPackage.flags;
-        //---
-        FREE_FORM = tasksPackage.FREE_FORM;
-        STATIC_SHADOW_ANALYSIS = tasksPackage.FREE_FORM;
-        MAX_SHADOW_WIDTH = tasksPackage.MAX_SHADOW_WIDTH;
-        STATIC_PRIVATE_ANALYSIS = tasksPackage.STATIC_PRIVATE_ANALYSIS;
-        KEEP_SPF_DIRECTIVES = tasksPackage.KEEP_SPF_DIRECTIVES;
-        KEEP_DVM_DIRECTIVES = tasksPackage.KEEP_DVM_DIRECTIVES;
     }
     public SapforTasksPackage(SapforTasksPackage src) {
         this.SynchronizeFields(src);
     }
     public SapforTasksPackage() {
     }
-    //----
-    @Description("IGNORE")
-    public Vector<Test> tests = null;
-    @Description("IGNORE")
-    public Vector<PassCode_2021> codes = null;
     public SapforTasksPackage(SapforConfiguration configuration_in, Vector<Test> tests_in) {
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
index fe6534f1..331d6920 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformSapforTasksPackage.java
@@ -1,11 +1,10 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.Utils;
-import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
-import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.Json.ScenarioResults_json;
 import SapforTestingSystem.Json.Scenario_json;
+import SapforTestingSystem.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -13,8 +12,6 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.Vector;
 public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
     File packageWorkspace;
@@ -126,6 +123,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
         return true;
     }
     protected boolean parse() throws Exception {
+        /*
         if (performSapforScript("parse", parentTask, target.flags,
                 "-parse *.f *.for *.fdv *.f90 *.f77",
                 "parse_out.txt", "parse_err.txt")
@@ -135,8 +133,11 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
             taskResult.state = TaskState.DoneWithErrors;
             return false;
         }
+         */
+        return false;
     }
     protected boolean transformation(PassCode_2021 code) throws Exception {
+        /*
         task = new File(parentTask, "v1");
         Utils.CheckAndCleanDirectory(task); //папка для преобразования.
         if (performSapforScript("transformation", parentTask, target.flags,
@@ -151,9 +152,11 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
         }
         Utils.delete_with_check(task);
         taskResult.state = TaskState.DoneWithErrors;
+         */
         return false;
     }
     protected boolean variants() throws Exception {
+        /*
         if (performSapforScript("create_variants", parentTask, target.flags, " -t 13 -allVars",
                 "out.txt",
                 "err.txt"
@@ -170,6 +173,7 @@ public class PerformSapforTasksPackage extends Pass_2021<Scenario_json> {
             }
         }
         taskResult.state = TaskState.DoneWithErrors;
+         */
         return false;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/PerformScenario.java b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
index 6a0e94aa..afddc961 100644
--- a/src/Visual_DVM_2021/Passes/All/PerformScenario.java
+++ b/src/Visual_DVM_2021/Passes/All/PerformScenario.java
@@ -1,7 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
-import GlobalData.Tasks.TaskState;
 import ProjectData.Project.db_project_info;
 import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.Json.ScenarioResults_json;
@@ -16,8 +15,6 @@ 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.Comparator;
 import java.util.Vector;
 //создание дерева версий одного теста по заданному сценарию.
 public class PerformScenario extends Pass_2021<Scenario_json> {
@@ -148,6 +145,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
         return true;
     }
     protected boolean parse() throws Exception {
+        /*
         if (performSapforScript("parse", parentTask, target.flags,
                 "-parse *.f *.for *.fdv *.f90 *.f77",
                 "parse_out.txt", "parse_err.txt")
@@ -157,8 +155,11 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
             taskResult.state = TaskState.DoneWithErrors;
             return false;
         }
+         */
+        return false;
     }
     protected boolean transformation(PassCode_2021 code) throws Exception {
+        /*
         task = new File(parentTask, "v1");
         Utils.CheckAndCleanDirectory(task); //папка для преобразования.
         if (performSapforScript("transformation", parentTask, target.flags,
@@ -175,9 +176,11 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
         Utils.delete_with_check(task);
         clearSapforFiles(parentTask);
         taskResult.state = TaskState.DoneWithErrors;
+         */
         return false;
     }
     protected boolean variants() throws Exception {
+        /*
         if (performSapforScript("create_variants", parentTask, target.flags, " -t 13 -allVars",
                 "out.txt",
                 "err.txt"
@@ -196,6 +199,7 @@ public class PerformScenario extends Pass_2021<Scenario_json> {
         }
         clearSapforFiles(parentTask);
         taskResult.state = TaskState.DoneWithErrors;
+         */
         return false;
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index ec3d04b4..38d0209e 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -7,6 +7,7 @@ import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand;
+import SapforTestingSystem.SapforScenario.SapforScenario;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import TestingSystem.Group.Group;
 import TestingSystem.Test.Test;
@@ -200,6 +201,9 @@ public class StartSapforTests extends Pass_2021<Vector<SapforTasksPackage>> {
                 );
             }
         }
+        SapforScenario scenario = new SapforScenario();
+
+
         /*
         ShowMessage1("Создание рабочих пространств...");
         for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems()) {