Merge
This commit is contained in:
parent
1b253bb2c7
commit
ecddd5231d
3
.gitignore
vendored
3
.gitignore
vendored
@ -29,3 +29,6 @@ replay_pid*
|
|||||||
*.pyc
|
*.pyc
|
||||||
.idea/workspace.xml
|
.idea/workspace.xml
|
||||||
.idea/workspace.xml
|
.idea/workspace.xml
|
||||||
|
.idea/workspace.xml
|
||||||
|
__pycache__/IDManager.cpython-39.pyc
|
||||||
|
*.pyc
|
||||||
|
21
.idea/workspace.xml
generated
21
.idea/workspace.xml
generated
@ -3,7 +3,6 @@
|
|||||||
<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$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" 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" />
|
||||||
@ -39,16 +38,12 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">{
|
<component name="PropertiesComponent">
|
||||||
"keyToString": {
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||||
"WebServerToolWindowFactoryState": "false",
|
</component>
|
||||||
"last_opened_file_path": "C:/Users/duaho/Projects/website materials/MarioWeb/Mario-AI-Interface",
|
|
||||||
"nodejs_package_manager_path": "npm"
|
|
||||||
}
|
|
||||||
}</component>
|
|
||||||
<component name="RunManager" selected="Flask server.Flask (main.py)">
|
<component name="RunManager" selected="Flask server.Flask (main.py)">
|
||||||
<configuration name="MarioWeb" type="PythonConfigurationType" factoryName="Python">
|
<configuration name="MarioWeb" type="PythonConfigurationType" factoryName="Python">
|
||||||
<module name="MarioWeb" />
|
<module name="MarioWeb" />
|
||||||
@ -159,6 +154,7 @@
|
|||||||
<workItem from="1667998268807" duration="2593000" />
|
<workItem from="1667998268807" duration="2593000" />
|
||||||
<workItem from="1668064138807" duration="9019000" />
|
<workItem from="1668064138807" duration="9019000" />
|
||||||
<workItem from="1668486144158" duration="499000" />
|
<workItem from="1668486144158" duration="499000" />
|
||||||
|
<workItem from="1668580997687" duration="473000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
@ -175,10 +171,11 @@
|
|||||||
</entry>
|
</entry>
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="oldMeFiltersMigrated" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
<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$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___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>
|
</component>
|
||||||
</project>
|
</project>
|
Binary file not shown.
Binary file not shown.
@ -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,,,,,
|
||||||
127.0.0.1,,,,,
|
127.0.0.1,,,,,
|
||||||
|
127.0.0.1,,,,,,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user