стата вариантов в json

This commit is contained in:
2025-05-20 14:33:28 +03:00
parent 688f36c4c3
commit 9eede4802e
4 changed files with 24 additions and 11 deletions

6
.idea/workspace.xml generated
View File

@@ -7,8 +7,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -1,36 +1,47 @@
package _VisualDVM.ProjectData.PredictorStatistic; package _VisualDVM.ProjectData.PredictorStatistic;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import java.util.Date; import java.util.Date;
import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.rankNaN; import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.rankNaN;
import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.statNaN; import static _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant.statNaN;
public class PredictorStatistics_2021 extends DBObject { public class PredictorStatistics extends DBObject {
@Description("PRIMARY KEY, UNIQUE") @Description("PRIMARY KEY, UNIQUE")
public String key = ""; public String key = "";
public long PredictionTime = 0; public long PredictionTime = 0;
//статистика ------------------------------- //json----------------------------------
@Expose
public long ParallelCount = statNaN; public long ParallelCount = statNaN;
@Expose
public long RemoteCount = statNaN; public long RemoteCount = statNaN;
@Expose
public long RedistributeCount = statNaN; public long RedistributeCount = statNaN;
@Expose
public long IntervalCount = statNaN; public long IntervalCount = statNaN;
@Expose
public long PS_RemoteCount = statNaN; public long PS_RemoteCount = statNaN;
@Expose
public long PS_ShadowCount = statNaN; public long PS_ShadowCount = statNaN;
@Expose
public long PS_ReductionCount = statNaN; public long PS_ReductionCount = statNaN;
@Expose
public long PS_AcrossCount = statNaN; public long PS_AcrossCount = statNaN;
@Expose
public long Rank = rankNaN; public long Rank = rankNaN;
///---------------------------------------------
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String last_version = ""; public String last_version = "";
//------------------------------------------- //-------------------------------------------
@Description("IGNORE") @Description("IGNORE")
public boolean loaded = true; public boolean loaded = true;
//этот конструктор только для пустой статистики. //этот конструктор только для пустой статистики.
public PredictorStatistics_2021(String key_in) { public PredictorStatistics(String key_in) {
key = key_in; key = key_in;
loaded = false; loaded = false;
} }
public PredictorStatistics_2021() { public PredictorStatistics() {
} }
public Date getPredictionDate() { public Date getPredictionDate() {
return new Date(PredictionTime); return new Date(PredictionTime);

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.PredictorStatistic; package _VisualDVM.ProjectData.PredictorStatistic;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
public class PredictorStatisticsDBTable extends DBTable<String, PredictorStatistics_2021> { public class PredictorStatisticsDBTable extends DBTable<String, PredictorStatistics> {
public PredictorStatisticsDBTable() { public PredictorStatisticsDBTable() {
super(String.class, PredictorStatistics_2021.class); super(String.class, PredictorStatistics.class);
} }
} }

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Variants; package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.Pair; 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.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -17,7 +17,7 @@ public class ParallelVariant extends DBObject {
public String UniqKey = ""; public String UniqKey = "";
public int dc = 0; public int dc = 0;
public db_project_info father = null; public db_project_info father = null;
public PredictorStatistics_2021 stats = null; public PredictorStatistics stats = null;
public Vector<String> templates_description = new Vector<>(); public Vector<String> templates_description = new Vector<>();
public LinkedHashMap<Pair<BigInteger, BigInteger>, Long> key = new LinkedHashMap<>(); public LinkedHashMap<Pair<BigInteger, BigInteger>, Long> key = new LinkedHashMap<>();
public File project = null; public File project = null;
@@ -39,7 +39,7 @@ public class ParallelVariant extends DBObject {
} }
public void load_stats() { public void load_stats() {
stats = father.db.predictorStatistics.Data.containsKey(UniqKey) ? 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 { public void UpdateStats(String packed, String last_version) throws Exception {
stats.Unpack(packed); stats.Unpack(packed);