This commit is contained in:
bigJIU 2023-02-28 17:16:27 +08:00
parent f7be38c963
commit 2b5c85484c
7 changed files with 11 additions and 14 deletions

16
.idea/workspace.xml generated
View File

@ -3,18 +3,11 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment=""> <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$/.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/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$/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/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/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameWelcome.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameWelcome.html" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -218,7 +211,8 @@
<workItem from="1676991343098" duration="1013000" /> <workItem from="1676991343098" duration="1013000" />
<workItem from="1677221941122" duration="2329000" /> <workItem from="1677221941122" duration="2329000" />
<workItem from="1677303698061" duration="6278000" /> <workItem from="1677303698061" duration="6278000" />
<workItem from="1677563906178" duration="4152000" /> <workItem from="1677563906178" duration="5318000" />
<workItem from="1677572224495" duration="1591000" />
</task> </task>
<servers /> <servers />
</component> </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$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$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_.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> </component>
</project> </project>

Binary file not shown.

View File

@ -29,3 +29,5 @@ IP,A-ID,B-ID,Anno,
127.0.0.1,31,125,N, 127.0.0.1,31,125,N,
127.0.0.1,56,57,N, 127.0.0.1,56,57,N,
127.0.0.1,200,144,N, 127.0.0.1,200,144,N,
127.0.0.1,43,129,B,
127.0.0.1,71,60,N,

1 IP A-ID B-ID Anno
29 127.0.0.1 31 125 N
30 127.0.0.1 56 57 N
31 127.0.0.1 200 144 N
32 127.0.0.1 43 129 B
33 127.0.0.1 71 60 N

View File

@ -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,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,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,,

1 IP,Style,Frequency,Age,Gender
200 127.0.0.1,A,A,A,E,B,C,,
201 127.0.0.1,A,A,A,A,A,A,,
202 127.0.0.1,A,A,A,A,A,A,,
203 127.0.0.1,A,B,D,A,A,C,,

View File

@ -172,7 +172,7 @@
<div id="replayWindow" class="popwindow"> <div id="replayWindow" class="popwindow">
<div id="replayWindowGame"> <div id="replayWindowGame">
</div> </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 align="center" id = "replayButton" class="cirButton"><button onClick='closeReplayWindow()'>Close Window</button></div>
</div> </div>

View File

@ -121,7 +121,7 @@
<div id="replayWindow" class="popwindow"> <div id="replayWindow" class="popwindow">
<div id="replayWindowGame"> <div id="replayWindowGame">
</div> </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 align="center" id = "replayButton"><button onClick='closeReplayWindow()'>Close Window</button></div>
</div> </div>

View File

@ -159,7 +159,7 @@
cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l"); cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l");
console.log("Cheerpj Initialize Succeed!"); console.log("Cheerpj Initialize Succeed!");
console.log("Going to play %d levels under control %s",levelNum,"{{control}}") console.log("Going to play %d levels under control %s",levelNum,"{{control}}")
var control = ("HTML: {{control}}" == "1"); var control = ("{{control}}" == "1")
GameLoad().then(function (){ GameLoad().then(function (){
console.log("Cheerpj Initialize Succeed!"); console.log("Cheerpj Initialize Succeed!");