From 1259db50414c460fdd4a32b1ed03a30827fda426 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 17 Nov 2024 17:04:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=85=D0=BE=D0=B4.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  18 +++++++-----------
 properties                                    |   4 ++--
 .../All/SPF_RemoveDistArraysFromIO.java       |   4 ++++
 src/_VisualDVM/Passes/PassCode.java           |  10 +++++++---
 .../Passes/SSH/RepositoryServerSSHPass.java   |   2 +-
 .../Repository/Component/Sapfor/Sapfor.java   |   5 ++++-
 .../SPF_RemoveDistArraysFromIO.png            | Bin 0 -> 1397 bytes
 7 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java
 create mode 100644 src/icons/Transformations/SPF_RemoveDistArraysFromIO.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 05c046d0..192ec25e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RemoveDistArraysFromIO.png" afterDir="false" />
       <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/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.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/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,7 +92,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/Common/icons" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -109,9 +105,9 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
     </key>
diff --git a/properties b/properties
index b6b77579..27d42239 100644
--- a/properties
+++ b/properties
@@ -26,14 +26,14 @@
   "BugReportsDBName": "bug_reports.sqlite",
   "TestsDBName": "tests.sqlite",
   "ComponentsWindowWidth": 843,
-  "ComponentsWindowHeight": 250,
+  "ComponentsWindowHeight": 519,
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false,
   "eraseTestingWorkspaces": true,
diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java b/src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java
new file mode 100644
index 00000000..94e483cd
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java
@@ -0,0 +1,4 @@
+package _VisualDVM.Passes.All;
+import _VisualDVM.Passes.Sapfor.SapforTransformation;
+public class SPF_RemoveDistArraysFromIO extends SapforTransformation {
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 16f54254..16b7eda6 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -108,6 +108,7 @@ public enum PassCode implements PassCode_ {
     SPF_SharedMemoryParallelization,
     SPF_RemoveOmpDirectives,
     SPF_RenameIncludes,
+    SPF_RemoveDistArraysFromIO,
     //
     RestoreSavedArrays,
     MassSelectArrays,
@@ -350,13 +351,13 @@ public enum PassCode implements PassCode_ {
     DeleteDVMSettings,
     CloneDVMSettings,
     CloneSapforSettings,
-    SetSapforConfigurationEthalon
-    ;
-    //--
+    SetSapforConfigurationEthalon;
     //--
     @Override
     public String getDescription() {
         switch (this) {
+            case SPF_RemoveDistArraysFromIO:
+                return "Устранение конфликтов ввода вывода";
             case StartSelectedSAPFORConfigurations:
                 return "Запустить отмеченные конфигурации";
             case ShowCurrentSAPFORConfigurationTests:
@@ -906,6 +907,9 @@ public enum PassCode implements PassCode_ {
             case SPF_RemoveDeadCode:
                 name = "REMOVE_DEAD_CODE_AND_UNPARSE";
                 break;
+            case SPF_RemoveDistArraysFromIO:
+                name = "REMOVE_DIST_ARRAYS_FROM_IO";
+                break;
         }
         return p + " " + name;
     }
diff --git a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
index 6415f816..fd412df2 100644
--- a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
+++ b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
@@ -64,7 +64,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
         //--
         ShowMessage1("Создание файла INTERRUPT..");
         user.connection.writeToFile("", INTERRUPT);
-        ShowMessage1("Ожидание остановки сервера тестирования");
+        ShowMessage1("Ожидание остановки сервера...");
         do {
             Utils_.sleep(1000);
             ShowMessage2("Проверка признака остановки..");
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
index d2787f31..1a7d1511 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Repository.Component.Sapfor;
 import Common.CommonConstants;
+import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
@@ -102,7 +103,8 @@ public abstract class Sapfor extends OSDComponent {
     public static PassCode[] getRegionsTransformationsCodes() {
         return new PassCode[]{
                 PassCode.SPF_ResolveParallelRegionConflicts,
-                PassCode.SPF_InsertDvmhRegions
+                PassCode.SPF_InsertDvmhRegions,
+                PassCode.SPF_RemoveDistArraysFromIO
         };
     }
     public static PassCode[] getPreparationTransformationsCodes() {
@@ -156,6 +158,7 @@ public abstract class Sapfor extends OSDComponent {
         res.add(PassCode.SPF_DuplicateFunctionChains);//+
         //--
         res.add(PassCode.SPF_ResolveParallelRegionConflicts);//+
+        res.add(PassCode.SPF_RemoveDistArraysFromIO);
         res.add(PassCode.SPF_ResolveCommonBlockConflicts);//+
         //-
         res.add(PassCode.SPF_InsertDvmhRegions);//+
diff --git a/src/icons/Transformations/SPF_RemoveDistArraysFromIO.png b/src/icons/Transformations/SPF_RemoveDistArraysFromIO.png
new file mode 100644
index 0000000000000000000000000000000000000000..317b462abb1e6639f697b8f4a4060b39405b59a5
GIT binary patch
literal 1397
zcmV-*1&aEKP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000tn
z000tn0p4aGcmMzZAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=`$<GWRCwCl*3D}pWgG|aZ?X+_n|YpT`bJ+eO-h=kZIYQulT2pjnYT_dGo8Fl
zo2C>NOV_;!;=w;cJc>s_WnCA<iw6-DK@da)SA?~@f=B-VPkZp<%EpUHx9Dzr(SwIC
zb9tE0JkK-F@AqIh9OB;&{xd|=G|bM<f>H`X2qZ~@<2cya*@0zQ@H`K#R%;y3^N`78
zUR4z3nxZIZG#VGiL{WrZuZLc*cR5n6R$&+hn$0F$*M;l4Xf~Tr6s5Yny!<(1EUv05
zbX|w<`|y1qK@ebne;-j4A&R1_A&fEfdOh^}eH<Jd;PCKpa%pMlD?tz{uIr-P?IH|A
zwA*bo8jWCkd;8^P(}m+Wa2)4qh^ng4G!2$z!Llq=tJN}q?*V)#Ns?{bHo`CjW2~7>
zChynlwT;2x5C;eQI5^mUK4MuG>h(G_O@m<=@O>Xq6d?!#<n#I5!otG0Q52CVioh7#
zC4}71X0vI=7><qxI64~O@UVZ5=(;{eIF5rX%ZQ?=Ha9nSmoYYB7{&!q5QL8^l}fAK
zZbR2~n^O8iE|(MX`8-V1K&R72u~>v<S?7qNDD$aQs?2emNC*)LA!4aidIi8Rl}deW
z7zV9Yt56gLhGC#wE-$v*Z7{}6Lde<r`npgml~5=YAP53@o(H8Anx>s2Q&Us70SuoN
zO6gg-TwY;}!F65OwhhBD3_{3RE|*KIstVIIA&MfB$s`CNn3<V@uIuN><mBX?=OF-w
z6B84^%Cejdf&i9f8HA7r`FvhbRTY^`=5^oqWl562aU3Y6e@7CD#NEpfO6fh%^LW!V
z8OL#Fg+f6vO%n?X3m*a)*6a1tnVFdtO6dwAWF?hKt?0U*93yjcb8jXRiANI?6OTsE
zcs%~w2;h1Clil6jm}!~~O6mR0&CL}}(_WaLpa1fy5BUSY<5(>AI2MaNj>qG_6GGk|
zBkgwkTBTB<qA2pBDDt&hjrTln0ARSdxcHu77%&V&p_D$@*x1OpuDh5_CV#$c_K8H|
zgE10@Au5#$L{Wq&if|kUzVFL|AiVL{Mk|!khpVfrIoq}o1i|X{>(_s|0&?e>$mnlr
zHk&X_vqlJckjv%PYPA}=-7b!gkD=@OEXQ&8o_gt%SS<D=9*>VRH8u6l1w@u*NRkA`
z7+S3s!Z3tw+jWlPe%jpJT=zUL?z-+wzu!l%*Mn)AkR)j;l}dd9V5n)@OQI-dip654
zSS)5rrBa45#*dL82%zgac6WE-`#!=jgk@O@rSvSD&E}&hLZMK&ttd(_3_}D#0Nb`9
ziXwDfk1s7Pz2EJ270>ffE|($8GAfnI#S=d&;jZgqZ*LElWmS2e|8Z??ZQb)c*tXrC
zo}T`=R;!ImxbOQYm&?#J4W?<raU2+i0Z|koNfKmPhH0AT$f&~FwhdKPb)M%RX0zEX
zMNx3$#to#?>30EqGd(^1>Cw><`u#ozg8^*YMx)Ufufpim|05EHA;K_3uh&DdSbQ;?
z&6YPdHlS%5`u#o_V_05ZertPs`!(P9#~sjhU5uL6rO4^&DNavMaqHGCxUP$QK96Ft
zh#&~i>2%;YP9>dAe-=eitlRBklrRj({pM2S<m3b=Cnvah^Cld}K`xiW&dv@xoenyk
z4pdc@x3;#9JDm=KAV3fV*xTDftJS*tO#T;FqCW=!+!Gi~DRKd|00000NkvXXu0mjf
DbCQH#

literal 0
HcmV?d00001