From 9eede4802e1592cdd2cf04b9b2d60e456a279ac8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 20 May 2025 14:33:28 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D0=B0=20=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B0=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B2=20json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 ++++--
 ...ics_2021.java => PredictorStatistics.java} | 19 +++++++++++++++----
 .../PredictorStatisticsDBTable.java           |  4 ++--
 .../SapforData/Variants/ParallelVariant.java  |  6 +++---
 4 files changed, 24 insertions(+), 11 deletions(-)
 rename src/_VisualDVM/ProjectData/PredictorStatistic/{PredictorStatistics_2021.java => PredictorStatistics.java} (84%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6d1e13d5..678573a5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.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/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics_2021.java b/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics.java
similarity index 84%
rename from src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics_2021.java
rename to src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics.java
index 133cdb75..45b68360 100644
--- a/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics_2021.java
+++ b/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatistics.java
@@ -1,36 +1,47 @@
 package _VisualDVM.ProjectData.PredictorStatistic;
 import Common.Database.Objects.DBObject;
+import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Date;
 
 import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.rankNaN;
 import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.statNaN;
-public class PredictorStatistics_2021 extends DBObject {
+public class PredictorStatistics extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")
     public String key = "";
     public long PredictionTime = 0;
-    //статистика -------------------------------
+    //json----------------------------------
+    @Expose
     public long ParallelCount = statNaN;
+    @Expose
     public long RemoteCount = statNaN;
+    @Expose
     public long RedistributeCount = statNaN;
+    @Expose
     public long IntervalCount = statNaN;
+    @Expose
     public long PS_RemoteCount = statNaN;
+    @Expose
     public long PS_ShadowCount = statNaN;
+    @Expose
     public long PS_ReductionCount = statNaN;
+    @Expose
     public long PS_AcrossCount = statNaN;
+    @Expose
     public long Rank = rankNaN;
+    ///---------------------------------------------
     @Description("DEFAULT ''")
     public String last_version = "";
     //-------------------------------------------
     @Description("IGNORE")
     public boolean loaded = true;
     //этот конструктор только для пустой статистики.
-    public PredictorStatistics_2021(String key_in) {
+    public PredictorStatistics(String key_in) {
         key = key_in;
         loaded = false;
     }
-    public PredictorStatistics_2021() {
+    public PredictorStatistics() {
     }
     public Date getPredictionDate() {
         return new Date(PredictionTime);
diff --git a/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java b/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java
index 050cb7a0..2600fbd1 100644
--- a/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java
+++ b/src/_VisualDVM/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.PredictorStatistic;
 import Common.Database.Tables.DBTable;
-public class PredictorStatisticsDBTable extends DBTable<String, PredictorStatistics_2021> {
+public class PredictorStatisticsDBTable extends DBTable<String, PredictorStatistics> {
     public PredictorStatisticsDBTable() {
-        super(String.class, PredictorStatistics_2021.class);
+        super(String.class, PredictorStatistics.class);
     }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
index 10084f8d..a41e7025 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Variants;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Pair;
-import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
+import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -17,7 +17,7 @@ public class ParallelVariant extends DBObject {
     public String UniqKey = "";
     public int dc = 0;
     public db_project_info father = null;
-    public PredictorStatistics_2021 stats = null;
+    public PredictorStatistics stats = null;
     public Vector<String> templates_description = new Vector<>();
     public LinkedHashMap<Pair<BigInteger, BigInteger>, Long> key = new LinkedHashMap<>();
     public File project = null;
@@ -39,7 +39,7 @@ public class ParallelVariant extends DBObject {
     }
     public void load_stats() {
         stats = father.db.predictorStatistics.Data.containsKey(UniqKey) ?
-                father.db.predictorStatistics.Data.get(UniqKey) : new PredictorStatistics_2021(UniqKey);
+                father.db.predictorStatistics.Data.get(UniqKey) : new PredictorStatistics(UniqKey);
     }
     public void UpdateStats(String packed, String last_version) throws Exception {
         stats.Unpack(packed);