view.pyの更新

KCCTdensan · Oct 13, 2023 · 3ddd893 · 3ddd893
1 parent 83437d1
commit 3ddd893
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 143 deletions.
diff --git a/simulator/src/__pycache__/solve5.cpython-311.pyc b/simulator/src/__pycache__/solve5.cpython-311.pyc
diff --git a/simulator/src/__pycache__/view.cpython-311.pyc b/simulator/src/__pycache__/view.cpython-311.pyc
diff --git a/simulator/src/result/solve1-90-3.csv b/simulator/src/result/solve1-90-3.csv
@@ -9,7 +9,7 @@ normalRandomWalk.py-first,,,,,,,,,,,,,,,,,,
 normalRandomWalk.py-second,,,,,,,,,,,,,,,,,,
 solve4.py-first,,,,,,,,,,,,,,,,,,
 solve4.py-second,,,,,,,,,,,,,,,,,,
-solve5.py-first,,,,,,,,,,,,,,,,,,WIN: 90 - -1
+solve5.py-first,,,,,,,,,,,,,,,,,,WIN: 10 - -1
 solve5.py-second,,,,,,,,,,,,,,,,,,
 solve6.py-first,,,,,,,,,,,,,,,,,,
 solve6.py-second,,,,,,,,,,,,,,,,,,
diff --git a/simulator/src/result/solve1/solve5/C25-90-3.txt b/simulator/src/result/solve1/solve5/C25-90-3.txt
@@ -33,145 +33,5 @@
         "succeeded": true
       }
     ]
-  },
-  {
-    "turn": 2,
-    "actions": [
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 7,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 2,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      }
-    ]
-  },
-  {
-    "turn": 3,
-    "actions": [
-      {
-        "type": 1,
-        "dir": 5,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 4,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 6,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 2,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 3,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 4,
-        "succeeded": true
-      }
-    ]
-  },
-  {
-    "turn": 4,
-    "actions": [
-      {
-        "type": 1,
-        "dir": 6,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 7,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 2,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 8,
-        "succeeded": true
-      }
-    ]
-  },
-  {
-    "turn": 5,
-    "actions": [
-      {
-        "type": 2,
-        "dir": 6,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 4,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 8,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 4,
-        "succeeded": true
-      },
-      {
-        "type": 2,
-        "dir": 4,
-        "succeeded": true
-      },
-      {
-        "type": 1,
-        "dir": 3,
-        "succeeded": true
-      }
-    ]
   }
 ]
diff --git a/simulator/src/result/solve5-90-3.csv b/simulator/src/result/solve5-90-3.csv
@@ -1,6 +1,6 @@
 ,A11,A13,A15,A17,A21,A25,B11,B13,B15,B17,B21,B25,C11,C13,C15,C17,C21,C25
 solve1.py-first,,,,,,,,,,,,,,,,,,
-solve1.py-second,,,,,,,,,,,,,,,,,,LOSE: -1 - 90
+solve1.py-second,,,,,,,,,,,,,,,,,,LOSE: -1 - 10
 solve2.py-first,,,,,,,,,,,,,,,,,,
 solve2.py-second,,,,,,,,,,,,,,,,,,
 solve3.py-first,,,,,,,,,,,,,,,,,,

diff --git a/simulator/src/solve5.py b/simulator/src/solve5.py
@@ -93,7 +93,8 @@ def solve5(interface, solver):
 
         nowPointPoses = []
         for i, p in enumerate(pointPos):
-            if i in otherAreas or i in protectedArea: continue
+            if i in otherAreas or i in protectedArea or i in cantProtectArea:
+                continue
             targets = []
             for target in p:
                 if board.walls[target] != 1: targets.append(target)

diff --git a/simulator/src/view.py b/simulator/src/view.py
@@ -78,6 +78,10 @@ def drawField(canvas, field, x, y, x0, length):
         canvas.create_oval(x0+(x+0.3)*length+2, 50+(y+0.3)*length+2,
                        x0+(x+0.7)*length-2, 50+(y+0.7)*length-2,
                        fill="green2", outline="green2")
+    if (y, x) in viewPos:
+        canvas.create_oval(x0+(x+0.3)*length+2, 50+(y+0.3)*length+2,
+                       x0+(x+0.7)*length-2, 50+(y+0.7)*length-2,
+                       fill="pink", outline="pink")
 
 
 def selecting():