M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

переименования в единый стиль полей массивов и регионов

Browse Source
This commit is contained in:
02090095
2025-05-17 18:07:07 +03:00
parent 0cb4022969
commit cba4425cd7
9 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -9,9 +9,9 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.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" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1747072936\\test_routine_7", "ProjectsSearchDirectory": "E:\\BUG",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system", "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

2
src/Common/Visual/UI.java
View File

@@ -59,12 +59,10 @@ public class UI {
return Question(MainModule_.instance.getUI().getFrontWindow(), text); return Question(MainModule_.instance.getUI().getFrontWindow(), text);
} }
public static void Info(String message) { public static void Info(String message) {
Utils_.CopyToClipboard(message);
if (UI.isActive()) if (UI.isActive())
JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1); JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 1);
} }
public static void Error(String message) { public static void Error(String message) {
Utils_.CopyToClipboard(message);
if (UI.isActive()) if (UI.isActive())
JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0); JOptionPane.showMessageDialog(MainModule_.instance.getUI().getFrontWindow(), message, "", 0);
} }

2
src/_VisualDVM/Constants.java
View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1247; public static final int version = 1248;
public static final int planner_version = 24; public static final int planner_version = 24;
public static final int testingMaxKernels = 64; public static final int testingMaxKernels = 64;
//-- //--

3
src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Utils.Index; import Common.Utils.Index;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis; import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -36,7 +37,7 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
for (ProjectArray array: arraysJson.allArrays){ for (ProjectArray array: arraysJson.allArrays){
array.Init(); array.Init();
target.declaratedArrays.put(array.id, array); target.declaratedArrays.put(array.id, array);
array.print(); // array.print();
} }
for (DBProjectFile file : target.db.files.Data.values()) for (DBProjectFile file : target.db.files.Data.values())
file.ArrayGraphTitle = "Объявлений: " + file.array_decls.size(); file.ArrayGraphTitle = "Объявлений: " + file.array_decls.size();

16
src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java
View File

@@ -9,9 +9,9 @@ import java.math.BigInteger;
import java.util.Vector; import java.util.Vector;
public class AlignRule { public class AlignRule {
@Expose @Expose
public String packed_alignArray_address; public String packedAlignArrayAddress;
@Expose @Expose
public String packed_alignWith_address; public String packedAlignWithAddress;
@Expose @Expose
public Vector<IntegerPairJson> alignRule; public Vector<IntegerPairJson> alignRule;
@Expose @Expose
@@ -41,13 +41,13 @@ public class AlignRule {
} }
public void Init(){ public void Init(){
//-- //--
if (packed_alignArray_address!=null) if (packedAlignArrayAddress !=null)
alignArray_address = new BigInteger(packed_alignArray_address); alignArray_address = new BigInteger(packedAlignArrayAddress);
if (packed_alignWith_address!=null) if (packedAlignWithAddress !=null)
alignWith_address = new BigInteger(packed_alignWith_address); alignWith_address = new BigInteger(packedAlignWithAddress);
//-- //--
packed_alignArray_address = null; packedAlignArrayAddress = null;
packed_alignWith_address = null; packedAlignWithAddress = null;
} }
private static Pair<String, String> convertDigitToPositive(int digit) { private static Pair<String, String> convertDigitToPositive(int digit) {
String buf = ""; String buf = "";

10
src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -8,17 +8,17 @@ public class ArrayDecl extends FileObjectWithMessages {
@Expose @Expose
public String file = ""; public String file = "";
@Expose @Expose
public String array_name; public String arrayName;
@Expose @Expose
public int array_loc; public int arrayLoc;
//-- //--
public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) { public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) {
super(father_in, lineNum_in); super(father_in, lineNum_in);
array_name = array_name_in; arrayName = array_name_in;
array_loc = array_loc_in; arrayLoc = array_loc_in;
} }
@Override @Override
public String Description() { public String Description() {
return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name); return ArrayLocation.fromInt(arrayLoc).getDescription() + " массив " + Utils_.Brackets(arrayName);
} }
} }

6
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -24,7 +24,7 @@ public class ProjectArray extends DBObject {
@Expose @Expose
public long id; public long id;
@Expose @Expose
public String packed_address; public String packedAddress;
@Expose @Expose
public String name; public String name;
@Expose @Expose
@@ -78,7 +78,7 @@ public class ProjectArray extends DBObject {
Vector<String> res = new Vector<>(); Vector<String> res = new Vector<>();
res.add(">"); res.add(">");
res.add("id=" + id); res.add("id=" + id);
res.add("packed_address=" + packed_address); res.add("packed_address=" + packedAddress);
res.add("name=" + name); res.add("name=" + name);
res.add("shortName=" + shortName); res.add("shortName=" + shortName);
res.add("dimSize=" + dimSize); res.add("dimSize=" + dimSize);
@@ -153,7 +153,7 @@ public class ProjectArray extends DBObject {
public void Init() { public void Init() {
//короткое имя+ функция/модуль/комон+ размерность //короткое имя+ функция/модуль/комон+ размерность
UniqKey = shortName + locName + dimSize; UniqKey = shortName + locName + dimSize;
if (packed_address != null) address = new BigInteger(packed_address); if (packedAddress != null) address = new BigInteger(packedAddress);
for (ArrayDecl arrayDecl : declPlaces) for (ArrayDecl arrayDecl : declPlaces)
arrayDecl.file = Utils_.toW(arrayDecl.file); arrayDecl.file = Utils_.toW(arrayDecl.file);
//-- полей нет в json поэтому они null //-- полей нет в json поэтому они null

16
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -18,11 +18,11 @@ import java.util.Vector;
public class ParallelRegion extends DBObject { public class ParallelRegion extends DBObject {
//json //json
@Expose @Expose
public String packed_region_id; public String packedRegionId;
@Expose @Expose
public String originalName; public String originalName;
@Expose @Expose
public List<ProjectArray> packed_arrays; public List<ProjectArray> packedArrays;
@Expose @Expose
public List<FileRegionLinesJson> regionsLines; public List<FileRegionLinesJson> regionsLines;
@Expose @Expose
@@ -125,9 +125,9 @@ public class ParallelRegion extends DBObject {
lines = new LinkedHashMap<>(); lines = new LinkedHashMap<>();
fragments = new Vector<>(); fragments = new Vector<>();
//-- //--
if (packed_region_id != null) if (packedRegionId != null)
regionId = new BigInteger(packed_region_id); regionId = new BigInteger(packedRegionId);
for (ProjectArray array : packed_arrays) { for (ProjectArray array : packedArrays) {
array.Init();//имена и адреса. array.Init();//имена и адреса.
arraysMap.put(array.address, array); arraysMap.put(array.address, array);
} }
@@ -139,9 +139,9 @@ public class ParallelRegion extends DBObject {
} }
} }
//-- //--
packed_region_id = null; packedRegionId = null;
packed_arrays.clear(); packedArrays.clear();
packed_arrays = null; packedArrays = null;
regionsLines.clear(); regionsLines.clear();
regionsLines = null; regionsLines = null;
//-- //--