From d3a64595dac4b18cc181090dce47960969da2fa7 Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Wed, 26 Oct 2022 11:49:14 +0800
Subject: [PATCH] Week7 done

---
 .idea/workspace.xml             |   5 ++++-
 Mario-AI-Interface/reps/1.txt   |   1 +
 Mario-AI-Interface/reps/t.txt   |   1 +
 __pycache__/main.cpython-39.pyc | Bin 1250 -> 1606 bytes
 evals/eval.txt                  |   1 +
 main.py                         |  29 +++++++++++++++++------------
 reps/1.txt                      |   1 +
 reps/2.txt                      |   1 +
 templates/eval.html             |  13 ++++++++++++-
 templates/play.html             |   8 +++-----
 10 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 Mario-AI-Interface/reps/1.txt
 create mode 100644 Mario-AI-Interface/reps/t.txt
 create mode 100644 evals/eval.txt
 create mode 100644 reps/1.txt
 create mode 100644 reps/2.txt

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8741666..ec6fdc0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/eval.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/eval.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/play.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/play.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -87,6 +88,8 @@
       <workItem from="1666269906002" duration="7106000" />
       <workItem from="1666331056069" duration="7259000" />
       <workItem from="1666340478319" duration="84000" />
+      <workItem from="1666700018091" duration="3635000" />
+      <workItem from="1666752468427" duration="1563000" />
     </task>
     <servers />
   </component>
@@ -105,6 +108,6 @@
     </option>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1666620093891" 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_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1666752985850" 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/Mario-AI-Interface/reps/1.txt b/Mario-AI-Interface/reps/1.txt
new file mode 100644
index 0000000..43bef96
--- /dev/null
+++ b/Mario-AI-Interface/reps/1.txt
@@ -0,0 +1 @@
+test2,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,18,18,18,18,18,18,18,2,2,2,2,2,2,2,18,18,18,18,18,18,18,18,18,2,2,2,2,2,2,2,2,2,18,18,18,18,18,2,2,2,2,2,2,2,2,2,2,2,2,2,2,18,18,18,18,18
\ No newline at end of file
diff --git a/Mario-AI-Interface/reps/t.txt b/Mario-AI-Interface/reps/t.txt
new file mode 100644
index 0000000..f6c18b4
--- /dev/null
+++ b/Mario-AI-Interface/reps/t.txt
@@ -0,0 +1 @@
+test2,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,18,18,18,18,18,18,18,18,18,2,2,2,2,2,2,18,18,18,18,18,2,2,2,2,2,2,2,18,18,18,18,18,18,18,2,2,2,2,2,2,2,16,16,16,16,18,18,18,2,2,2,2,2,2,2,2,2,0,0,16,16,18,18,18,18,18,18,18,18,2,2,2,2,18,18,18,18,18,18,18,18,18,18,18,2,2,2,2,2,18,18,18,18,18,18,18,18,18,18,18,2,2,2,2,2,2,2,2,2,2,2,2,18,18,18,18,18,18,18,18,2,2,2,2,2,2,2,2,2,2,2,2,2
\ No newline at end of file
diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index feb95acdd75893bb04edc3a8572d4c4d12f464fa..c593cf3dc1ff69573e56d3da3bba3025f080c125 100644
GIT binary patch
literal 1606
zcmaJ>-EJF26rP#gS+D=%G)a?I6v<Qq$wEpH;sR9&Ap!v*;YI{hX=Q1(*%`;{?vI%n
zH;v_7rMG#9_%biR1y8^;%ncG;<rR9xIpa1sDq^fTd;HDc`ObG{l6Jd6p#Amdv-A(2
zkiYTIY6FaX1zrCRMi4=B65*HSv|te{yvQs3$S-)riy#UpkxbTvC;Uqmg@Q+Q5kw6c
zUNuE+K}9I)ugC?BS`KLd(iAO+v}HJkIih_+#o8qk9kK54HHSBD@q1#!;T^FlwqB8F
z9ZtLdoT=Z$whZHYu<yo#KosG4Lu`wkOG+W;Bhq_t1M!o7k6V6_C;GYVC|L@rVk3)5
zo)~FsO8z>P+SpJ@ktvxPTbrsp9#+bd9<^<45|gFyKZkWQuH;1T%>wx%$@SiAx|iYs
zZyN;%Q@0OYuY(cvoES*koCxodK|p?gwmv!gbYzOWYv9<fHfmOfP|kJ{yQWd&%`gmH
zQ{}-X3bnc>ss*3dPxhY-e$i6tftV(vYH+BkF$Ap#r}9{5Ms^Eer80<a@MEH~>X|$q
z6iHU@PR=aPfcs0_O=FaV`BbgJcgFXS&mAgm9E_t9f&(<@1?H6XXLX$J0#;2Ja*?f=
zHelArIhX^@z!0W74n2H&^fRQjR!B3dgnsAD+w^?~(+wF@K|$wF3=`}ER5c7R&w0M#
z=nL;5&hsuj(A<akcwgbMvpOEt{Vplw4Q@K?>?bB2b$>W|+V6gon4}jd#BHz)#qx>D
zN@M-8u1Xu~<b^!Qa%tB<agYaB942P8LKF2+j%)Ko8r&Br-3L^=+r=6*qz$@7)dRrZ
zVHyDFvU>o|Ez__6o2l>|SAWS>@P}l_u@(V(j(ZKbhj+Mt3ktZjD=f?#XHbk;Gj*x>
zDG^!qCJky62GkZBWT3Xe*cNK|zsy^}+--xi-iI}JsDDJ&BfwG*%-e>vIdn(;dvK8Y
z707z!Ey$cK*f~-KWbVyD{2fGm<IjD;+ympC^EtobbGCqT058CcFNhO<=I@%9#?n*k
zPtEXisIyR(X(h7qq*t@7($=4VhM;kkl{SFb(^FynY9dR^PZeAr%hSBl5|Z)(gl5Ab
zlt2k3WNT?v8d;jiK`}fPQ5^?kw;>&_)CHD=%io9KEb~D(;I{_Fu*_>1$9N~>7_R~s
z@_2gE+f-dVkq_~mQYh2%@?(uEOqjyVSy+nk#If~~$wckoz<W5rRW*g1kN0`0IToEu
zzdKWXjFUVyEmtD_w}Qhjib_m#`6U*KehemLk5~&{2%kX_bLc+AU&9{OLK;A6{{y5>
BWsU#<

delta 711
zcmbV}!EVz)5QcZgUfXeP$7z$6qDpW95s3ogTp=VbP@zz%h=V0$rJZd^z)8EYIUpep
z;hIC`TTk@Z2LOo|;30hE#*If{b`hu&H&&Y2-EVgPnc4joeQzbhI1UAmuV*g~-#e$t
z%?|}+P+*3IlR1T(xrNLm2nEU`Bxi}4PdI`sQ2wVDx#vKVypLi5S!jvRB%qchE0%;z
zRw%M0QvQT*Q9J@lmPl<%Esy{5o!@~Dt=d4sY1dw({z6^l=WP~D&jpv`Pg3eqZwVl1
zeP8r9ewZ#!e?F-n!{<Gp*K^kpbU`OPziZv4VL3b=j?|&ymk03X5u3eH3RZ(bADZx>
zIyzE%cRrie&#<>1{1J%FSu_f$(>lVJ@#-bgso&y_vBSh_-sVLqCP2Vl+$xb^!8Mo2
z%&{xCl!ObW`+_+4g)`7bPN(cHJZ-vYyh4?)X4J@IJ)V}0JK>tNG^f1!DPF1foM>%>
zxATCVzz_lmL2uS4PWRz|SE9QnLC+@Gb>r=8|0KA|qzUr87>=iT{+!=Tk~*kHgMOzz
zllShlO<d|(RVw=lwkO>&vYW=4`+Cb9a&%=M`F^ld%&2;!9+*#=UuU<45qiiCNjBG5
M0-<j#0FN8}1qnEcn*aa+

diff --git a/evals/eval.txt b/evals/eval.txt
new file mode 100644
index 0000000..0709265
--- /dev/null
+++ b/evals/eval.txt
@@ -0,0 +1 @@
+2-1
\ No newline at end of file
diff --git a/main.py b/main.py
index 996cd19..cfcc7dc 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,11 @@
+import os
+
 from flask import Flask, render_template, request, redirect, url_for
 
 app = Flask(__name__, static_folder='')
 
-bufferJson = ['']
+replayDataPath = "reps/"
+evalDataPath = "evals/"
 
 @app.route('/')
 def index():
@@ -10,11 +13,6 @@ def index():
     return render_template('play.html', py2htmlstr=py2htmlstr)
 
 
-@app.route('/datapage')
-def datapage():
-    return bufferJson
-
-
 @app.route('/eval')
 def eval():
     return render_template('eval.html')
@@ -23,18 +21,25 @@ def eval():
 @app.route('/', methods=['POST'])
 def getJSONData():
     if request.method == 'POST':
-        print("POST")
+        print("POST Game")
         print(request.json)
-        return redirect(url_for('datapage'))
+        saveFile(replayDataPath, request.json[4], request.json)
+    return "Catch JSON Data"
 
-
-@app.route('/', methods=['POST'])
+@app.route('/eval', methods=['POST'])
 def getRadioData():
     if request.method == 'POST':
-        print("POST")
+        print("POST Eval")
         print(request.json)
-        return redirect(url_for('datapage'))
+        saveFile(evalDataPath,"eval",request.json[0]+request.json[1]+request.json[2])
+    return "catch Radio"
 
+def saveFile(path,filename,content):
+    file_dir = os.path.join(os.getcwd(), path)
+    file_path = os.path.join(file_dir, filename+".txt")
+    f = open(file_path, "w", encoding="utf8")
+    f.write(content)
+    f.close()
 
 if __name__ == '__main__':
     app.debug = True
diff --git a/reps/1.txt b/reps/1.txt
new file mode 100644
index 0000000..0052a08
--- /dev/null
+++ b/reps/1.txt
@@ -0,0 +1 @@
+test1,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,18,18,18,18,18,18,18,18,18,2,2,2,2,2,2
\ No newline at end of file
diff --git a/reps/2.txt b/reps/2.txt
new file mode 100644
index 0000000..c84ad50
--- /dev/null
+++ b/reps/2.txt
@@ -0,0 +1 @@
+test2,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,18,18,18,18,18,18,18,18,18,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,18,18,18,18,0,0,0,0,0,0,0,0,0,0,0,18,18,18,18,18,18,18,18,18,18,18,18,2,2,2,2,2,2,2,2,18,18,18,18,18,2,2,2,2,2,2,2,2,18,18,18,18,18,18,2,2,2,2,2,2,2,2,2,2,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,2,1
\ No newline at end of file
diff --git a/templates/eval.html b/templates/eval.html
index 3ef9d22..dd10f83 100644
--- a/templates/eval.html
+++ b/templates/eval.html
@@ -101,6 +101,17 @@
                     }
                 }
             }
+            function PostToServer(data) {
+                var httpRequest = new XMLHttpRequest();//第一步：建立所需的对象
+                httpRequest.open("POST","");  //调用AddDataToServer
+                httpRequest.setRequestHeader("Content-Type", "application/json");   //设置请求头信息
+                httpRequest.onreadystatechange = function () {
+                    if (httpRequest.readyState == 4 && httpRequest.status == 200) {
+                    //alert('添加成功');
+                    }
+                }
+                httpRequest.send(JSON.stringify(data)); //设置为发送给服务器数据
+            }
             window.onload=function(){
                 closeReplayWindow();
             }
@@ -153,7 +164,7 @@
                 var obj = document.getElementsByName("fun");
                 for(var i=0; i<obj.length; i ++){
                     if(obj[i].checked){
-                        
+                        PostToServer(obj[i].value);
                         alert(obj[i].value);
                     }
                 }
diff --git a/templates/play.html b/templates/play.html
index d5d1d41..09aca2b 100644
--- a/templates/play.html
+++ b/templates/play.html
@@ -11,7 +11,7 @@
         return returnVal.then(function(){ 
           console.log("the return val is ready");  
           console.log(returnVal.value);
-          PostToServer(returnVal.value);    
+          PostToServer(level,returnVal.value);    
         });
       }
     
@@ -24,7 +24,7 @@
         }
       }
 
-      function PostToServer(data) {
+      function PostToServer(level, data) {
       var httpRequest = new XMLHttpRequest();//第一步：建立所需的对象
       httpRequest.open("POST","");  //调用AddDataToServer
       httpRequest.setRequestHeader("Content-Type", "application/json");   //设置请求头信息
@@ -33,9 +33,7 @@
           //alert('添加成功');
         }
       }
-      // console.log(typeof Array.from(data));
-      // console.log(Array.from(data));
-      httpRequest.send(JSON.stringify(Array.from(data))); //设置为发送给服务器数据
+      httpRequest.send(JSON.stringify(level+","+Array.from(data))); //设置为发送给服务器数据
     }
     </script>