Merge pull request #10 from Sofken-natori/型探索Test

型探索test
Sofken-natori · Oct 19, 2024 · 75ea49a · 75ea49a
2 parents 6381966 + fed756e
commit 75ea49a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.vs/2024ProconTemporary/v17/.suo b/.vs/2024ProconTemporary/v17/.suo
diff --git a/.vs/2024ProconTemporary/v17/DocumentLayout.json b/.vs/2024ProconTemporary/v17/DocumentLayout.json
@@ -44,7 +44,7 @@
               "RelativeDocumentMoniker": "2024ProconTemporary\\MainAlgorithm.cs",
               "ToolTip": "C:\\Users\\suzuk\\Downloads\\2024ProconTemporary\\2024ProconTemporary\\MainAlgorithm.cs*",
               "RelativeToolTip": "2024ProconTemporary\\MainAlgorithm.cs*",
-              "ViewState": "AQIAADcAAAAAAAAAAAAAwFAAAAAMAAAA",
+              "ViewState": "AQIAAD0AAAAAAAAAAAAAwFEAAAAtAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-08-06T11:13:35.538Z",
               "IsPinned": true,

diff --git a/2024ProconTemporary/MainAlgorithm.cs b/2024ProconTemporary/MainAlgorithm.cs
@@ -78,11 +78,12 @@ public class Mainalgorithm
                 PatternList[p.P] = Case.Copy(p.Cells.ToList());
             }
             PatternCount(queses, PatternList);
-            Hyoji(OneIndexList[255]);
             PatternDifferenceValue(PatternList);
+            Console.WriteLine(OneIndexList[25]);
             for (int direction = 0; direction < 4; direction++)
             {
-                //MaxN = 0;
+                N = 0;
+                Ops = new List<AnswerData.OperationData>();
                 if (direction == 0 || direction == 1)
                 {
                     dieCutting = Case.DieCuttingUP;
@@ -95,6 +96,7 @@ public class Mainalgorithm
                 queses = Items.Item1;
                 N = Items.Item2;
                 Ops = Items.Item3;
+                Console.WriteLine(Ops.Count);
                 if (direction == 0 || direction == 3)
                 {
                     dieCutting = Case.DieCuttingLeft;
@@ -103,7 +105,7 @@ public class Mainalgorithm
                 {
                     dieCutting = Case.DieCuttingRight;
                 }
-                for (int B = 0; B < 100; B++)
+                for (int B = 0; B < 10; B++)
                 {
                     IndexCount(queses, Xmax, Ymax);
                     var Items2 = SearchDie(queses, answer, false, PatternList);
@@ -129,6 +131,8 @@ public class Mainalgorithm
                     MaxOps = Ops;
                 }
             }
+            Console.WriteLine(Ops.Count);
+            Console.WriteLine(N);
             return (new AnswerData
             {
                 N = MaxN,
@@ -191,13 +195,14 @@ public static void CalculationTest(List<List<int>> queses, List<List<int>> answe
         }
         static (List<List<int>>, int, List<AnswerData.OperationData>) FirstSort(List<List<int>> queses, List<List<int>> answer, DieCutting dieCutting, List<AnswerData.OperationData> Ops, List<List<List<int>>> PatternList, int[][] WantListX, int[][] WantListY, int[][] WantListXS)
         {
+            Ops = new List<AnswerData.OperationData>();
             int N = 0;
             var answerT = QuestionShunting(queses, answer, Xmax, Ymax, WantListX, WantListY, WantListXS);
             answerT = Case.TranslatePos(answerT);
             var quesesT = Case.TranslatePos(queses);
             Hyoji(quesesT);
             Hyoji(answerT);
-            for (int B = 0; B < 100; B++)
+            for (int B = 0; B < 10; B++)
             {
                 IndexCount(quesesT, Ymax, Xmax);
                 var Items = SearchDie(quesesT, answerT, true, PatternList);

diff --git a/2024ProconTemporary/obj/Debug/net8.0/2024ProconTemporary.sourcelink.json b/2024ProconTemporary/obj/Debug/net8.0/2024ProconTemporary.sourcelink.json
@@ -1 +1 @@
-{"documents":{"C:\\Users\\sofken\\Documents\\Procon2024_Ignotus\\*":"https://raw.githubusercontent.com/ignotus404/Procon2024_Ignotus/8e39abc5301e11852af6386d1bb73ba886a2602a/*"}}
+{"documents":{"C:\\Users\\suzuk\\Downloads\\2024ProconTemporary\\*":"https://raw.githubusercontent.com/Sofken-natori/Procon2024/8e39abc5301e11852af6386d1bb73ba886a2602a/*"}}