From fad8c88da6b9cdb0d5dc7353ea5230146f9b985b Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期一, 10 五月 2021 17:16:19 +0800
Subject: [PATCH] 1.mmerge
---
P066.Data/Form1.cs | 184 +++++++++++++++++++++++++++++----------------
1 files changed, 119 insertions(+), 65 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 5488fa1..cedec44 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -67,8 +67,80 @@
}
+
+
+
+
private void btnAnalyze_Click(object sender, EventArgs e)
{
+
+
+ //璇诲彇鍏ㄩ儴琛ㄦ牸
+ var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
+ var listAllSum = new List<ResultData>();
+ List<Task> listTask = new List<Task>();
+ var DataTipsort = new List<string>();
+ for (int i = 0; i < fileinfos1.Count; i++)
+ {
+ int index = i;
+ var task = Task.Run(() =>
+ {
+ listAllSum.AddRange(GetFileData(fileinfos1[index]));
+ });
+ listTask.Add(task);
+ }
+ DataTipsort = readfile.TimeStamp(fileinfos1[0]);//璇诲彇涓�涓枃浠跺す鐨勬椂闂存埑
+ Task.WaitAll(listTask.ToArray());//绛夊叏閮ㄨ鍙栧畬鍚庡啀杩涜涓嬩竴姝�
+ Dictionary<int, string> dictionary = new Dictionary<int, string>();
+ dictionary.Add(1, "鍒濇涓闀滃ご");
+ dictionary.Add(2, "澶嶆涓闀滃ご");
+ dictionary.Add(3, "鍒濇鑳屾澘闀滃ご");
+ dictionary.Add(4, "澶嶆鑳屾澘闀滃ご");
+ List<ResultData> listCompareSum = new List<ResultData>();
+ for (int j = 1; j < 5; j++)
+ {
+ int indexMax = j;
+ for (int i = 1; i < 5; i++)
+ {
+ int index = i;
+ Task task = Task.Run(() =>
+ {
+ listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "鐧界偣"),
+ listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "鐧界偣"), DataTipsort));
+ });
+
+ listTask.Add(task);
+ }
+ }
+ for (int i = 1; i < 5; i++)
+ {
+ int index = i;
+ Task task = Task.Run(() =>
+ {
+ listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 1 + "鍒櫧"),
+ listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 2 + "鍒櫧"), DataTipsort));
+ });
+
+ listTask.Add(task);
+ }
+
+ Task.WaitAll(listTask.ToArray());
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
var Start = DateTime.Now;
#region 璇诲彇鏂囦欢澶逛笅鐨勬墍鏈夋枃浠讹紝骞跺皢鏂囦欢鎸夌収涓婁笅杩涜鍖哄垎;涓婅〃鏍间负fileInfo1锛屼笅琛ㄦ牸涓篺ileInfo2
List<FileInfo> fileInfo1 = new List<FileInfo>();
@@ -97,8 +169,7 @@
var ListReexaminationSum = new List<ResultData>(); //澶嶆鎶ヨ〃鏁版嵁
var ListPreliminarySum = new List<ResultData>(); //鍒濇鎶ヨ〃鏁版嵁
string filenameDir = "";
- int ScratchI = 0;
- int ZoomI = 0;
+
#region 璇诲彇涓�涓〃鏍间腑鎵�鏈夋椂闂存埑骞舵帓搴�
var dataList = GetFileData(fileInfo1[0]);
var dataGroup = dataList.GroupBy(a => a.TimeTip);
@@ -161,7 +232,7 @@
var taskReexamination = Task.Run (() =>
{
//澶嶆鎶ヨ〃
- ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
@@ -169,17 +240,13 @@
var taskPreliminary = Task.Run(() =>
{
//鍒濇鎶ヨ〃
- ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
+ /* ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); */ //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
});
taskReexamination.Wait();
- var Lens1sum = ListReexaminationSum.FindAll(a => a.DefectType=="鍒櫧" && a.Lensnumber == 1);
- var Lens2sum = ListReexaminationSum.FindAll(a => a.DefectType == "鍒櫧" && a.Lensnumber == 2);
- var Lens3sum = ListReexaminationSum.FindAll(a => a.DefectType == "鍒櫧" && a.Lensnumber == 3);
- var Lens4sum = ListReexaminationSum.FindAll(a => a.DefectType == "鍒櫧" && a.Lensnumber == 4);
@@ -485,15 +552,14 @@
}
#region 涓や釜琛ㄦ牸杩涜姣旇緝,濡傛灉涓や釜琛ㄦ牸涓湁璁惧鍒ゆ柇鏍囧噯涓嶇粺涓�锛屽皢璇ョ偣鍙樹负NG锛屽垹闄や袱涓〃鏍间腑NG鐐圭浉杩戠殑鏈�灏忓昂瀵哥偣.
- private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
+ private List<ResultData> CompareFile(List<ResultData> listOne, List<ResultData> listTwo,List<string> DataTipsort)
{
- var dataList1 = GetFileData(fileInfo1);
- var dataList2 = GetFileData(fileInfo2);
+
var dataList = new List<ResultData>();
- foreach (var item in DataTipsor)
+ foreach (var item in DataTipsort)
{
- var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
- var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
+ var list1 = listOne.FindAll(a => a.TimeTip == item && !a.Result);
+ var list2 = listTwo.FindAll(a => a.TimeTip == item && !a.Result);
var itemToRemove = new List<ResultData>();
//璁＄畻琛ㄦ牸1鏈�澶у昂瀵�
GetMaxSize(list1);
@@ -971,59 +1037,47 @@
#endregion
#region 鑾峰彇鐧界偣銆佸埉鐧芥暟鎹苟鎸夐暅澶磋緭鍑�
- private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
- {
- List<ResultData> ListReexaminationSum = new List<ResultData>();
- int WhiteI = 0;
- int WhiteningI = 0;
- List<Task> listTask = new List<Task>();
- for (int i = 0; i < fileInfo1.Count; i++)
- {
- int index = i;
- Task task = new Task(() => {
- var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
- //if (fileInfo1[index].Name.Contains("鐧界偣"))
- //{
- //WhiteI++;
- //list.ForEach(a => a.Lensnumber = WhiteI);
- ListReexaminationSum.AddRange(list);
- //}
- //else if (fileInfo1[index].Name.Contains("鍒櫧"))
- //{
- //WhiteningI++;
- //list.ForEach(a => a.Lensnumber = WhiteningI);
- //ListReexaminationSum.AddRange(list);
+ //private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
+ //{
+ // List<ResultData> ListReexaminationSum = new List<ResultData>();
+ // List<Task> listTask = new List<Task>();
+ // for (int i = 0; i < fileInfo1.Count; i++)
+ // {
+ // int index = i;
+ // Task task = new Task(() => {
+ // var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
+
+ // ListReexaminationSum.AddRange(list);
- //}
- if (fileInfo1[index].Name.Contains("鍒濇涓"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鐧界偣"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鍒櫧"))
- {
- list = GetWhiteLocation(list);
- }
- else if (fileInfo1[index].Name.Contains("鍒濇鑳屾澘"))
- {
- //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetBkLocation(list);
- }
- else if (fileInfo1[index].Name.Contains("澶嶆鑳屾澘") && fileInfo1[index].Name.Contains("鐧界偣"))
- {
- list = GetBkLocation(list);
- }
- });
- task.Start();
- listTask.Add(task);
+ // if (fileInfo1[index].Name.Contains("鍒濇涓"))
+ // {
+ // list = GetMidLocation(list);
+ // }
+ // else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鐧界偣"))
+ // {
+ // list = GetMidLocation(list);
+ // }
+ // else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鍒櫧"))
+ // {
+ // list = GetWhiteLocation(list);
+ // }
+ // else if (fileInfo1[index].Name.Contains("鍒濇鑳屾澘"))
+ // {
+ // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ // list = GetBkLocation(list);
+ // }
+ // else if (fileInfo1[index].Name.Contains("澶嶆鑳屾澘") && fileInfo1[index].Name.Contains("鐧界偣"))
+ // {
+ // list = GetBkLocation(list);
+ // }
+ // });
+ // task.Start();
+ // listTask.Add(task);
- }
- Task.WaitAll(listTask.ToArray());
- return ListReexaminationSum;
- }
+ // }
+ // Task.WaitAll(listTask.ToArray());
+ // return ListReexaminationSum;
+ //}
#endregion
#region //缁熻璁惧鏈竻闄ゆ暟銆佸妫�澶氭鍑烘暟
--
Gitblit v1.8.0