From ce17c37300daf7a883d5f0c136c3170a9bcaa624 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期三, 28 四月 2021 17:39:49 +0800
Subject: [PATCH] 1.0428数据
---
P066.Data/Form1.cs | 179 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 4863333..ca9d306 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -74,51 +74,50 @@
private void btnAnalyze_Click(object sender, EventArgs e)
{
+
+ //璇诲彇鍏ㄩ儴琛ㄦ牸
+ var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
+ List<ResultData> listSum = new List<ResultData>();
+ var listAllSum = new List<ResultData>();
+ List<Task> listTask = new List<Task>();
+ for (int i = 0; i < fileinfos1.Count; i++)
+ {
+ int index = i;
+ var task = Task.Run(() =>
+ {
+
+
+ listAllSum.AddRange(GetFileData(fileinfos1[index]));
+
+ });
+ listTask.Add(task);
+ }
+
+
+ Task.WaitAll(listTask.ToArray());
+ var TipGrp = listAllSum.FindAll(a => a.FileName=="澶嶆涓闀滃ご1_1鐧界偣").GroupBy(a=>a.TimeTip);
+ var DataTipsort = new List<string>();
+ foreach (var item in TipGrp)
+ {
+ DataTipsort.Add(item.Key);
+ }
+ DataTipsort.Distinct().ToList().Sort();
- //var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
- //List<ResultData> listSum1 = new List<ResultData>();
- //List<Task> listTask = new List<Task>();
- //for (int i = 0; i < fileinfos1.Count; i++)
- //{
- // int index = i;
- // var task= Task.Run(() => {
+ for (int i = 1; i < 5; i++)
+ {
+ int index = i;
+ Task task = Task.Run(() => {
+ listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "鍒濇涓闀滃ご" + index + "_" + 1 + "鐧界偣"),
+ listAllSum.FindAll(a => a.FileName == "鍒濇涓闀滃ご" + index + "_" + 2 + "鐧界偣"), DataTipsort));
+ });
-
- // listSum1.AddRange(GetFileData(fileinfos1[index]));
-
- // });
- // listTask.Add(task);
- //}
-
- //var fileinfos2 = directoryInfo3.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
- //List<ResultData> listSum2 = new List<ResultData>();
-
- //for (int i = 0; i < fileinfos2.Count; i++)
- //{
- // int index = i;
- // var task = Task.Run(() => {
+ listTask.Add(task);
+ }
- // listSum2.AddRange(GetFileData(fileinfos2[index]));
- // });
- // listTask.Add(task);
- //}
-
-
- //Task.WaitAll(listTask.ToArray());
-
-
- //List<string> str = new List<string>();
- //var listsumgrb = listSum2.GroupBy(a => a.FileName);
- //foreach (var item in listsumgrb)
- //{
-
- // var tst = item.Key;
- // str.Add(item.Key);
-
- //}
+ Task.WaitAll(listTask.ToArray());
@@ -126,7 +125,16 @@
- var Start = DateTime.Now;
+
+
+
+
+
+
+
+
+
+ var Start = DateTime.Now;
#region 璇诲彇鏂囦欢澶逛笅鐨勬墍鏈夋枃浠讹紝骞跺皢鏂囦欢鎸夌収涓婁笅杩涜鍖哄垎;涓婅〃鏍间负fileInfo1锛屼笅琛ㄦ牸涓篺ileInfo2
List<FileInfo> fileInfo1 = new List<FileInfo>();
List<FileInfo> fileInfo2 = new List<FileInfo>();
@@ -217,7 +225,7 @@
var taskReexamination = Task.Run (() =>
{
//澶嶆鎶ヨ〃
- ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
@@ -225,7 +233,7 @@
var taskPreliminary = Task.Run(() =>
{
//鍒濇鎶ヨ〃
- ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
+ /* ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); */ //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
});
@@ -537,15 +545,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);
@@ -1023,47 +1030,47 @@
#endregion
#region 鑾峰彇鐧界偣銆佸埉鐧芥暟鎹苟鎸夐暅澶磋緭鍑�
- 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);
+ //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);
+ // 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