From ecddd5231de68e87fe747867618189c0b0abee3c Mon Sep 17 00:00:00 2001
From: Sisyphus001 <74189127+BigJIU@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:52:54 +0800
Subject: [PATCH] Merge

---
 .gitignore                           |   3 +++
 .idea/workspace.xml                  |  21 +++++++++------------
 __pycache__/IDManager.cpython-39.pyc | Bin 2545 -> 2539 bytes
 __pycache__/main.cpython-39.pyc      | Bin 3761 -> 3730 bytes
 data/questionare.csv                 |   1 +
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index a66668b..db567cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ replay_pid*
 *.pyc
 .idea/workspace.xml
 .idea/workspace.xml
+.idea/workspace.xml
+__pycache__/IDManager.cpython-39.pyc
+*.pyc
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cfb7efb..1adb857 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <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$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -39,16 +38,12 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/duaho/Projects/website materials/MarioWeb/Mario-AI-Interface&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
-  }
-}</component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
   <component name="RunManager" selected="Flask server.Flask (main.py)">
     <configuration name="MarioWeb" type="PythonConfigurationType" factoryName="Python">
       <module name="MarioWeb" />
@@ -159,6 +154,7 @@
       <workItem from="1667998268807" duration="2593000" />
       <workItem from="1668064138807" duration="9019000" />
       <workItem from="1668486144158" duration="499000" />
+      <workItem from="1668580997687" duration="473000" />
     </task>
     <servers />
   </component>
@@ -175,10 +171,11 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <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="1668486153745" 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="1668079945407" 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="1668581358674" 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__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc
index addca8856c8726e0f00dfd25099628e331869575..2e846f5d7602df43b3d0b101ac50cc8f2433762e 100644
GIT binary patch
delta 326
zcmew;{92eVk(ZZ?0SG>}lq9oqZshY}<W_LCit%)D4JgXb+T6l8g^}^rW=UoaCPs<L
zO02Vl<bjGcnTiyFR1qJDkeGaq^)^s)6<Y^PQWYew29b1OFXI*mF{L5=qwJAsen4gk
zLk(jJV+vCWb1!qhPAzi@;{v7{=7o&4EHx|(n9~_*m=*zLCo(Q%WMl|uNMT?B!e(Yh
zhCBg7hGGW;21YQ91d=HX!3>%#epO6~+P4@q8E>)YrIzPp=A}-~=164}n0%4LHBbp;
zH`qbEAeIn_kO2{3Z-AW(3WXvu5FrU7<UoWnh)@9$>L5Y`L}-Et<H_lqVT`(y_i-8n
E0I+#Lga7~l

delta 341
zcmaDY{85-Mk(ZZ?0SE$_bCW-DY~=G{)UtQBiU}=FEh>&lDNW4Cj|nKs&q_@$DUK;m
zO)AbTNma;AEJ-cOOw1|XoXR+bkuhrXFD4EqM)Aqath0pVfM#hj6)6CzB0dlyK6yRs
zZJ=Z~TL(;11thKtkyK?b;}!!kr6Bxe?2*1sKxPR;4Py#pGgH4xEprLu0;U?~g^aZ<
zH7pC5YnT=?GBSiSq%g1mVKXx$L!N*kL$Qeg10xtl0?8DHV4y4fs+bbBC#Q0xGV)A5
z&EXoT2(kifFE5BC1R|tCgaU{Fy9yK*MWP@=0z}Ay2qh4q3?kG(ggS`O01*b06FI}!
Pv_MQIAX9wu6;5#gV=qQ|

diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index 33b75c96f85c7bc47f60d44eaa84c1f4e8794e8a..2b11868604d09db673f88204ca2eeee0d74a249a 100644
GIT binary patch
delta 50
zcmdleJ4u#1k(ZZ?0SG>}lx*alz{D->Y8B(@;u=ttpSAfYQwA5~t<8G8yo`)~lWq7)
E0bH667XSbN

delta 81
zcmbOvyHS=qk(ZZ?0SNdQb2oBNVA8U3wu%WYPAw{qNhwXt$d3sq%FjwoE-8*FPfaS$
jEJ;<!O)N<*%1q2D-n@({gNre0Ge0jcBctzRS-w&L&D|LB

diff --git a/data/questionare.csv b/data/questionare.csv
index fd633c2..82e8628 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -64,3 +64,4 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,,,,,

 127.0.0.1,,,,,

 127.0.0.1,,,,,

+127.0.0.1,,,,,,