++
добавление учета пробелов в сравнение
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
package _VisualDVM.ProjectData.SapforData.Regions;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.Index;
|
||||
import Common.Utils.IntegerPairJson;
|
||||
import Common.Utils.Pair;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.UI;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||
import _VisualDVM.ProjectData.SapforData.Arrays.AlignRule;
|
||||
@@ -30,6 +27,21 @@ public class ParallelRegion extends DBObject {
|
||||
public Vector<AlignRule> alignRules;
|
||||
//----
|
||||
public Vector<String> rules;
|
||||
//--
|
||||
public BigInteger regionId;
|
||||
//name in program
|
||||
// file -> <start, end> lines
|
||||
public LinkedHashMap<String, List<IntegerPairJson>> lines; //+
|
||||
//ключ - адрес. меняем
|
||||
public LinkedHashMap<BigInteger, ProjectArray> arraysMap; //+
|
||||
//for directive creating
|
||||
public int maxdim = 0;
|
||||
public Vector<String> fragments; //+
|
||||
public int lines_count = 0;
|
||||
public int loops_count = 0;
|
||||
public int arrays_count = 0;
|
||||
public int fd_count = 0;
|
||||
public int fc_count = 0;
|
||||
public void genRules(LinkedHashMap<BigInteger, ProjectArray> Arrays) {
|
||||
rules.clear();
|
||||
int maxLen = 0;
|
||||
@@ -48,26 +60,11 @@ public class ParallelRegion extends DBObject {
|
||||
for (String r : v)
|
||||
rules.add(r);
|
||||
}
|
||||
//--
|
||||
public BigInteger regionId;
|
||||
//name in program
|
||||
// file -> <start, end> lines
|
||||
public LinkedHashMap<String, List<IntegerPairJson>> lines; //+
|
||||
//ключ - адрес. меняем
|
||||
public LinkedHashMap<BigInteger, ProjectArray> arraysMap; //+
|
||||
//for directive creating
|
||||
public int maxdim = 0;
|
||||
public Vector<String> fragments; //+
|
||||
public int lines_count = 0;
|
||||
public int loops_count = 0;
|
||||
public int arrays_count = 0;
|
||||
public int fd_count = 0;
|
||||
public int fc_count = 0;
|
||||
public void Init() {
|
||||
arraysMap = new LinkedHashMap<>();
|
||||
lines = new LinkedHashMap<>();
|
||||
fragments = new Vector<>();
|
||||
rules=new Vector<>();
|
||||
rules = new Vector<>();
|
||||
//--
|
||||
if (packedRegionId != null)
|
||||
regionId = new BigInteger(packedRegionId);
|
||||
@@ -75,14 +72,14 @@ public class ParallelRegion extends DBObject {
|
||||
for (ProjectArray array : packedArrays) {
|
||||
array.Init();//имена и адреса.
|
||||
arraysMap.put(array.address, array);
|
||||
if (array.isTemplFlag==1){
|
||||
if (array.isTemplFlag == 1) {
|
||||
maxdim = Math.max(maxdim, array.dimSize);
|
||||
Global.mainModule.getProject().templates.add(array);
|
||||
array.regIDs.add(regionId);
|
||||
} else if (array.isLoopArrayFlag != 1) arrays_count++;
|
||||
}
|
||||
//---
|
||||
for (AlignRule rule: alignRules) {
|
||||
for (AlignRule rule : alignRules) {
|
||||
rule.Init();
|
||||
rule.parent_region = this;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user