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

промежуточный. в процессе поиска бага со сравнением.

Browse Source
This commit is contained in:
02090095
2024-02-25 01:50:56 +03:00
parent 037518a085
commit a85446b72d
13 changed files with 58 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/TestingSystem/SAPFOR/Json/SapforPackage_json.java
View File

@@ -3,6 +3,7 @@ import GlobalData.Tasks.TaskState;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.SapforTask.MatchState;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageComparisonSummary;
import TestingSystem.SAPFOR.SapforTasksPackage.UI.PackageSummary;
import com.google.gson.annotations.Expose;
@@ -31,9 +32,9 @@ public class SapforPackage_json implements Serializable {
public List<SapforTask> tasks = new Vector<>();
//-
public PackageSummary root = null;
public PackageSummary comparison_root = null;
public PackageComparisonSummary comparison_root = null;
//--
public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>();
public LinkedHashMap<String, SapforTask> allTasks = new LinkedHashMap<>(); //задачи по ключам (?)
public LinkedHashMap<TaskState, Vector<SapforTask>> sortedTasks = new LinkedHashMap<>();
// public LinkedHashMap<TaskState, LinkedHashMap<Integer, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = new LinkedHashMap<>();
//-- задачи, отсортированные для сравнения.
@@ -45,12 +46,12 @@ public class SapforPackage_json implements Serializable {
// UI.Info("DROP COMPARISON");
comparison_root = null;
comparisonSortedTasks.clear();
for (SapforTask task : allTasks.values())
task.matchState = MatchState.NotMatch;
for (SapforTask task: tasks)
task.matchState = MatchState.Unknown;
}
public void SortTasks() {
//-- СБРОС СРАВНЕНИЯ
for (SapforTask task: allTasks.values())
for (SapforTask task: tasks)
task.matchState = MatchState.Unknown;
//--
sortedTasks.clear();
@@ -103,19 +104,16 @@ public class SapforPackage_json implements Serializable {
}
}
public void buildComparisonTree(SapforPackage package_in) {
comparison_root = new PackageSummary();
comparison_root = new PackageComparisonSummary();
comparison_root.count = package_in.package_json.allTasks.size();
//--
for (MatchState match_state : comparisonSortedTasks.keySet()) {
// MatchesSummary matchesSummary = new MatchesSummary(match_state);
int count = 0;
LinkedHashMap<TaskState, Vector<SapforTask>> task_states = comparisonSortedTasks.get(match_state);
//---
for (TaskState state : task_states.keySet()) {
Vector<SapforTask> tasks = task_states.get(state);
//-
if (state.equals(TaskState.DoneWithErrors))
comparison_root.errors_count += tasks.size();
//-
for (SapforTask task : tasks) {
DefaultMutableTreeNode taskNode = task.getNode(Paths.get(
package_in.getLocalWorkspace().getAbsolutePath(),
@@ -123,9 +121,11 @@ public class SapforPackage_json implements Serializable {
String.valueOf(task.sapfor_configuration_id)
).toFile());
comparison_root.add(taskNode);
count++;
}
}
if (match_state.equals(MatchState.NotMatch))
comparison_root.mismatches_count+=count;
}
}
}