рефакторинг. переносил текущие объекты в другое место
This commit is contained in:
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.Index;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.AlignRule;
|
||||
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.DataDirective;
|
||||
@@ -63,7 +64,7 @@ public class ParallelRegion extends DBObject {
|
||||
//-------------------------------------------------------
|
||||
if (new_array.isTemplFlag == 1) {
|
||||
maxdim = Math.max(maxdim, new_array.dimSize);
|
||||
Current.getProject().templates.add(new_array);
|
||||
Global.mainModule.getProject().templates.add(new_array);
|
||||
new_array.regIDs.add(regionId);
|
||||
} else if (new_array.isLoopArrayFlag != 1) arrays_count++;
|
||||
}
|
||||
@@ -82,7 +83,7 @@ public class ParallelRegion extends DBObject {
|
||||
for (String FKey : lines.keySet()) {
|
||||
for (Pair<Integer, Integer> L : lines.get(FKey)) {
|
||||
lines_count += (L.getValue() - L.getKey());
|
||||
DBProjectFile f = Current.getProject().db.files.Data.get(FKey);
|
||||
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);
|
||||
loops_count += f.FragmentLoopCount(L.getKey(), L.getValue());
|
||||
fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue());
|
||||
fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue());
|
||||
@@ -111,7 +112,7 @@ public class ParallelRegion extends DBObject {
|
||||
loops_count = 0;
|
||||
for (String FKey : lines.keySet()) {
|
||||
for (Pair<Integer, Integer> L : lines.get(FKey)) {
|
||||
DBProjectFile f = Current.getProject().db.files.Data.get(FKey);
|
||||
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);
|
||||
loops_count += f.FragmentLoopCount(L.getKey(), L.getValue());
|
||||
}
|
||||
}
|
||||
@@ -121,7 +122,7 @@ public class ParallelRegion extends DBObject {
|
||||
fc_count = 0;
|
||||
for (String FKey : lines.keySet()) {
|
||||
for (Pair<Integer, Integer> L : lines.get(FKey)) {
|
||||
DBProjectFile f = Current.getProject().db.files.Data.get(FKey);
|
||||
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);
|
||||
fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue());
|
||||
fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue());
|
||||
}
|
||||
@@ -131,7 +132,7 @@ public class ParallelRegion extends DBObject {
|
||||
arrays_count=0;
|
||||
for (String FKey : lines.keySet()) {
|
||||
for (Pair<Integer, Integer> L : lines.get(FKey)) {
|
||||
DBProjectFile f = Current.getProject().db.files.Data.get(FKey);
|
||||
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);
|
||||
arrays_count += f.FragmentArraysCount(L.getKey(), L.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user