From 2b5c85484cdfb3c6f02cb9df90dfe8bec177e6ce Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Tue, 28 Feb 2023 17:16:27 +0800
Subject: [PATCH] Debug

---
 .idea/workspace.xml             |  16 +++++-----------
 __pycache__/main.cpython-39.pyc | Bin 5841 -> 5913 bytes
 data/annotation.csv             |   2 ++
 data/questionare.csv            |   1 +
 templates/GameAnnotation.html   |   2 +-
 templates/GameAnnotation2.html  |   2 +-
 templates/GamePlay.html         |   2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e8b8f5..4c6350b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,18 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/HumanAgent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/HumanAgent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/ReplayAgent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/agents/ReplayAgent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/MarioActions.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/MarioActions.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/GameAnnotation2.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation2.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameOver.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameOver.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameWelcome.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameWelcome.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -218,7 +211,8 @@
       <workItem from="1676991343098" duration="1013000" />
       <workItem from="1677221941122" duration="2329000" />
       <workItem from="1677303698061" duration="6278000" />
-      <workItem from="1677563906178" duration="4152000" />
+      <workItem from="1677563906178" duration="5318000" />
+      <workItem from="1677572224495" duration="1591000" />
     </task>
     <servers />
   </component>
@@ -240,6 +234,6 @@
     <SUITE FILE_PATH="coverage/MarioWeb$MarioWeb.coverage" NAME="MarioWeb Coverage Results" MODIFIED="1669305478201" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1677224605926" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) (1) Coverage Results" MODIFIED="1677566663144" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) (1) Coverage Results" MODIFIED="1677568713708" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index ee4cbf722f802af9b4fd57f73075d1f0385dc012..f2b0ce9d5e2fe8a6ecebc09d1e18422decb814c4 100644
GIT binary patch
delta 378
zcmXv`J4gdT6ujB{<g(`SF_#Dt6%~sVrV&A~2}rP!1XLml3c*B;7{R?mL<oY22$EPV
z7Ivl+yKq|ATL_9`6|fS)#@<rnZoqxayxI5W&Fknz$|_hERm3~H`dNKxS}hd`?^C@8
z2Kcq!4vmYIV@LzBVYc~=af(Tv_SKN)&%O_2yrww;%<wP&G4kFH&8yhs57r&3{4n^4
zBc2VNpzgIoeE|2q!%rA&$jtsuCPe_YfJqDt!2tOsZB6Iz-NOeE23=rEx)Xw2<q|I0
zR2!%&u2w{mh*E3noRZYC`_^=!Qp)X?SZc$qY_TzMkR)%$T6w$dY%J-HTUak8b=E89
zEF(!~GnvaYK}oP#sRRGS>s>}9Cw{jAj<hHwV0a7B5n!HI?M1BcmVIt4iv`PjEEY#Z
dH$k;9XiW5u=FNCir$Nw&P(A*rm{ZfF_yb2CQ?dX6

delta 276
zcmbQKcTtx&k(ZZ?0SFqF|4i=K$a|fcQF8NB<|B-Za+6oF{^vFUN)<DK6fjNR!Pd=a
zIoXB1m(gzWCH6;*&YQP#STHhrPkzVQ#u&P}lq-yxv2yYm-kpqfliT=CGqz3+;_qPW
z-+Y^2mXUGF=AQy*808m%%##6|$HmCQC<4SBOl*uAj7<NT{<E-5ekP<mxsO>^fY&`S
zH`Tu^wMZ|cBsZssdvXAm_~c$;E;g`RI5y80R%K)io_tg!k}-C&yy#T67@(O&p__M!
viZN=ka4>SQ2rzPqf@mbn&d12b3FNZ^F&B_6H2I;JFfT8N1rp)l;9>*-2rNHv

diff --git a/data/annotation.csv b/data/annotation.csv
index d666853..a982fdc 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -29,3 +29,5 @@ IP,A-ID,B-ID,Anno,
 127.0.0.1,31,125,N,
 127.0.0.1,56,57,N,
 127.0.0.1,200,144,N,
+127.0.0.1,43,129,B,
+127.0.0.1,71,60,N,
diff --git a/data/questionare.csv b/data/questionare.csv
index 4d25e7e..80d7c0f 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -200,3 +200,4 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,A,A,A,E,B,C,,
 127.0.0.1,A,A,A,A,A,A,,
 127.0.0.1,A,A,A,A,A,A,,
+127.0.0.1,A,B,D,A,A,C,,
diff --git a/templates/GameAnnotation.html b/templates/GameAnnotation.html
index d7a1fa5..017b134 100644
--- a/templates/GameAnnotation.html
+++ b/templates/GameAnnotation.html
@@ -172,7 +172,7 @@
 <div id="replayWindow" class="popwindow">
   <div id="replayWindowGame">
   </div>
-    <p>Click "Q" to stop playing and quit</p>
+    <p><b>Click "Q" to stop replay and quit</b></p>
   <div align="center"  id = "replayButton" class="cirButton"><button onClick='closeReplayWindow()'>Close Window</button></div>
 </div>
 
diff --git a/templates/GameAnnotation2.html b/templates/GameAnnotation2.html
index a5c74fb..e44bacc 100644
--- a/templates/GameAnnotation2.html
+++ b/templates/GameAnnotation2.html
@@ -121,7 +121,7 @@
 <div id="replayWindow" class="popwindow">
   <div id="replayWindowGame">
   </div>
-    <p>Click "Q" to stop playing and quit</p>
+    <p><b>Click "Q" to stop replay and quit</b></p>
   <div align="center"  id = "replayButton"><button onClick='closeReplayWindow()'>Close Window</button></div>
 </div>
 
diff --git a/templates/GamePlay.html b/templates/GamePlay.html
index edcbf16..58cc329 100644
--- a/templates/GamePlay.html
+++ b/templates/GamePlay.html
@@ -159,7 +159,7 @@
             cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l");
             console.log("Cheerpj Initialize Succeed!");
             console.log("Going to play %d levels under control %s",levelNum,"{{control}}")
-            var control = ("HTML: {{control}}" == "1");
+            var control = ("{{control}}" == "1")
 
             GameLoad().then(function (){
                 console.log("Cheerpj Initialize Succeed!");