sync
This commit is contained in:
wjsjwr
parent
02c1a67c59
commit
786aee8fc4
@ -1,21 +1,37 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="3b8f67a0-ea53-4209-a86f-9effd70f9663" name="Default" comment="" />
|
<list default="true" id="3b8f67a0-ea53-4209-a86f-9effd70f9663" name="Default" comment="">
|
||||||
|
<change afterPath="$PROJECT_DIR$/plot_cluster_size.py" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/sb_variant.py" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/sb_vs_human.py" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/cluster_stat.py" beforeDir="false" afterPath="$PROJECT_DIR$/cluster_stat.py" afterDir="false" />
|
||||||
|
</list>
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="FUSProjectUsageTrigger">
|
||||||
|
<session id="445450180">
|
||||||
|
<usages-collector id="statistics.lifecycle.project">
|
||||||
|
<counts>
|
||||||
|
<entry key="project.closed" value="1" />
|
||||||
|
<entry key="project.open.time.4" value="1" />
|
||||||
|
<entry key="project.opened" value="1" />
|
||||||
|
</counts>
|
||||||
|
</usages-collector>
|
||||||
|
</session>
|
||||||
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf>
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file leaf-file-name="br_plot.py" pinned="false" current-in-tab="false">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/br_plot.py">
|
<entry file="file://$PROJECT_DIR$/br_plot.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="133">
|
<state relative-caret-position="38">
|
||||||
<caret line="7" column="14" lean-forward="false" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="14" />
|
<caret line="7" column="14" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="14" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#18#0" expanded="true" />
|
<element signature="e#0#18#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -23,11 +39,11 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="draw_network.py" pinned="false" current-in-tab="true">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/draw_network.py">
|
<entry file="file://$PROJECT_DIR$/draw_network.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="912">
|
<state relative-caret-position="855">
|
||||||
<caret line="48" column="109" lean-forward="false" selection-start-line="48" selection-start-column="109" selection-end-line="48" selection-end-column="109" />
|
<caret line="48" column="109" selection-start-line="48" selection-start-column="109" selection-end-line="48" selection-end-column="109" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
<element signature="e#0#21#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -35,12 +51,94 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="G302.json" pinned="false" current-in-tab="false">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/wos-data-compete/G302.json">
|
<entry file="file://$PROJECT_DIR$/cluster_stat.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-17524">
|
<state relative-caret-position="912">
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
<caret line="52" column="14" selection-start-line="52" selection-start-column="14" selection-end-line="52" selection-end-column="14" />
|
||||||
<folding />
|
<folding>
|
||||||
|
<element signature="e#20#30#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/sb_variant.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="551">
|
||||||
|
<caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#30#48#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/calc_reward.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state>
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#11#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/calc_winner_pid.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="532">
|
||||||
|
<caret line="30" column="33" selection-start-line="12" selection-start-column="8" selection-end-line="30" selection-end-column="33" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#11#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/sb_vs_human.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="437">
|
||||||
|
<caret line="32" column="42" lean-forward="true" selection-start-line="32" selection-start-column="42" selection-end-line="32" selection-end-column="42" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#65#76#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G354.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="83676">
|
||||||
|
<caret line="4404" column="16" selection-start-line="4404" selection-start-column="12" selection-end-line="4404" selection-end-column="16" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/plot_cluster_size.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="266">
|
||||||
|
<caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#23#59#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/eid_plot.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="19">
|
||||||
|
<caret line="6" column="16" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="16" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#18#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@ -54,6 +152,12 @@
|
|||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
<component name="FindInProjectRecents">
|
||||||
|
<findStrings>
|
||||||
|
<find>4627</find>
|
||||||
|
<find>4614</find>
|
||||||
|
</findStrings>
|
||||||
|
</component>
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
@ -61,32 +165,24 @@
|
|||||||
<option name="CHANGED_PATHS">
|
<option name="CHANGED_PATHS">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/draw_network.py" />
|
<option value="$PROJECT_DIR$/draw_network.py" />
|
||||||
|
<option value="$PROJECT_DIR$/cluster_stat.py" />
|
||||||
|
<option value="$PROJECT_DIR$/plot_cluster_size.py" />
|
||||||
|
<option value="$PROJECT_DIR$/sb_variant.py" />
|
||||||
|
<option value="$PROJECT_DIR$/sb_vs_human.py" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds" extendedState="7">
|
<component name="ProjectFrameBounds" extendedState="6">
|
||||||
<option name="x" value="-8" />
|
<option name="x" value="-8" />
|
||||||
<option name="y" value="-8" />
|
<option name="y" value="-8" />
|
||||||
<option name="width" value="2560" />
|
<option name="width" value="2560" />
|
||||||
<option name="height" value="1440" />
|
<option name="height" value="1440" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="ProjectPane" proportions="" version="1">
|
<navigator proportions="" version="1">
|
||||||
<flattenPackages />
|
|
||||||
<showMembers />
|
|
||||||
<showModules />
|
|
||||||
<showLibraryContents />
|
|
||||||
<hideEmptyPackages />
|
|
||||||
<abbreviatePackageNames />
|
|
||||||
<autoscrollToSource />
|
|
||||||
<autoscrollFromSource />
|
|
||||||
<sortByType />
|
|
||||||
<manualOrder />
|
|
||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scratches" />
|
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<expand>
|
<expand>
|
||||||
@ -94,10 +190,15 @@
|
|||||||
<item name="swdata" type="b2602c69:ProjectViewProjectNode" />
|
<item name="swdata" type="b2602c69:ProjectViewProjectNode" />
|
||||||
<item name="swdata" type="462c0819:PsiDirectoryNode" />
|
<item name="swdata" type="462c0819:PsiDirectoryNode" />
|
||||||
</path>
|
</path>
|
||||||
|
<path>
|
||||||
|
<item name="swdata" type="b2602c69:ProjectViewProjectNode" />
|
||||||
|
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
|
||||||
|
</path>
|
||||||
</expand>
|
</expand>
|
||||||
<select />
|
<select />
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
|
<pane id="Scope" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
@ -116,8 +217,9 @@
|
|||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager">
|
<component name="RunManager" selected="Python.sb_vs_human">
|
||||||
<configuration name="draw_network" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
<configuration name="cluster_stat" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
|
<module name="swdata" />
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true" />
|
||||||
<envs>
|
<envs>
|
||||||
@ -128,22 +230,116 @@
|
|||||||
<option name="IS_MODULE_SDK" value="true" />
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/cluster_stat.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
<configuration name="draw_network" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
<module name="swdata" />
|
<module name="swdata" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/draw_network.py" />
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/draw_network.py" />
|
||||||
<option name="PARAMETERS" value="" />
|
<option name="PARAMETERS" value="" />
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
<option name="MODULE_MODE" value="false" />
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
</configuration>
|
</configuration>
|
||||||
|
<configuration name="plot_cluster_size" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
|
<module name="swdata" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/plot_cluster_size.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
<configuration name="sb_variant" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
|
<module name="swdata" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/sb_variant.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
<configuration name="sb_vs_human" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||||
|
<module name="swdata" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="PYTHONUNBUFFERED" value="1" />
|
||||||
|
</envs>
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="true" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/sb_vs_human.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||||
|
<option name="EMULATE_TERMINAL" value="false" />
|
||||||
|
<option name="MODULE_MODE" value="false" />
|
||||||
|
<option name="REDIRECT_INPUT" value="false" />
|
||||||
|
<option name="INPUT_FILE" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
<list>
|
||||||
|
<item itemvalue="Python.draw_network" />
|
||||||
|
<item itemvalue="Python.cluster_stat" />
|
||||||
|
<item itemvalue="Python.plot_cluster_size" />
|
||||||
|
<item itemvalue="Python.sb_variant" />
|
||||||
|
<item itemvalue="Python.sb_vs_human" />
|
||||||
|
</list>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list size="1">
|
<list>
|
||||||
<item index="0" class="java.lang.String" itemvalue="Python.draw_network" />
|
<item itemvalue="Python.sb_vs_human" />
|
||||||
|
<item itemvalue="Python.sb_variant" />
|
||||||
|
<item itemvalue="Python.plot_cluster_size" />
|
||||||
|
<item itemvalue="Python.cluster_stat" />
|
||||||
|
<item itemvalue="Python.draw_network" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
<component name="ShelveChangesManager" show_recycled="false">
|
|
||||||
<option name="remove_strategy" value="false" />
|
|
||||||
</component>
|
|
||||||
<component name="SvnConfiguration">
|
<component name="SvnConfiguration">
|
||||||
<configuration />
|
<configuration />
|
||||||
</component>
|
</component>
|
||||||
@ -167,47 +363,56 @@
|
|||||||
</todo-panel>
|
</todo-panel>
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-8" y="-8" width="2576" height="1416" extended-state="7" />
|
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13831478" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13950716" />
|
||||||
<window_info id="TODO" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" order="1" weight="0.25" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" order="2" side_tool="true" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Event Log" order="0" side_tool="true" />
|
||||||
<window_info id="Run" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Message" order="1" />
|
||||||
<window_info id="Version Control" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Find" order="2" />
|
||||||
<window_info id="Python Console" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39228934" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||||
<window_info id="Terminal" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298887" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
<window_info anchor="right" id="Python Console" order="3" weight="0.39228934" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" id="Terminal" order="4" weight="0.3298887" />
|
||||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" id="Version Control" order="5" weight="0.3298887" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" id="TODO" order="6" weight="0.3298887" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info anchor="right" id="Run" order="7" visible="true" weight="0.32869634" />
|
||||||
</layout>
|
</layout>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsContentAnnotationSettings">
|
<component name="VcsContentAnnotationSettings">
|
||||||
<option name="myLimit" value="2678400000" />
|
<option name="myLimit" value="2678400000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
|
||||||
<breakpoint-manager />
|
|
||||||
<watches-manager />
|
|
||||||
</component>
|
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/wos-data-compete/G302.json">
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G302.json">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-17524">
|
<state relative-caret-position="-17524" />
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
</provider>
|
||||||
<folding />
|
</entry>
|
||||||
</state>
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G421.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="-99675" />
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G448.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor" />
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G481.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor" />
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G254.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="-51724" />
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/br_plot.py">
|
<entry file="file://$PROJECT_DIR$/br_plot.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="133">
|
<state relative-caret-position="38">
|
||||||
<caret line="7" column="14" lean-forward="false" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="14" />
|
<caret line="7" column="14" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="14" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#18#0" expanded="true" />
|
<element signature="e#0#18#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -216,13 +421,89 @@
|
|||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/draw_network.py">
|
<entry file="file://$PROJECT_DIR$/draw_network.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="912">
|
<state relative-caret-position="855">
|
||||||
<caret line="48" column="109" lean-forward="false" selection-start-line="48" selection-start-column="109" selection-end-line="48" selection-end-column="109" />
|
<caret line="48" column="109" selection-start-line="48" selection-start-column="109" selection-end-line="48" selection-end-column="109" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
<element signature="e#0#21#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/cluster_stat.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="912">
|
||||||
|
<caret line="52" column="14" selection-start-line="52" selection-start-column="14" selection-end-line="52" selection-end-column="14" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#20#30#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/sb_variant.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="551">
|
||||||
|
<caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#30#48#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/calc_reward.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state>
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#11#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/calc_winner_pid.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="532">
|
||||||
|
<caret line="30" column="33" selection-start-line="12" selection-start-column="8" selection-end-line="30" selection-end-column="33" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#11#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/wos-data-compete/G354.json">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="83676">
|
||||||
|
<caret line="4404" column="16" selection-start-line="4404" selection-start-column="12" selection-end-line="4404" selection-end-column="16" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/plot_cluster_size.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="266">
|
||||||
|
<caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#23#59#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/eid_plot.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="19">
|
||||||
|
<caret line="6" column="16" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="16" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#0#18#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/sb_vs_human.py">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="437">
|
||||||
|
<caret line="32" column="42" lean-forward="true" selection-start-line="32" selection-start-column="42" selection-end-line="32" selection-end-column="42" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#65#76#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@ -31,10 +31,23 @@ class ClusterStat:
|
|||||||
for k in lmax:
|
for k in lmax:
|
||||||
cluster[k] = cmin
|
cluster[k] = cmin
|
||||||
res = [v for v in Counter(cluster.values()).values()]
|
res = [v for v in Counter(cluster.values()).values()]
|
||||||
print(m.name, list(sorted(res, reverse=True)))
|
# print(m.name, list(sorted(res, reverse=True)))
|
||||||
self.detail[m.name] = res
|
self.detail[m.name] = res
|
||||||
|
|
||||||
|
|
||||||
|
def output(self):
|
||||||
|
data = []
|
||||||
|
for r in self.detail.values():
|
||||||
|
data.extend(r)
|
||||||
|
res = np.zeros(max(data))
|
||||||
|
s = sum(data)
|
||||||
|
for d in data:
|
||||||
|
res[d-1] += d
|
||||||
|
res /= s
|
||||||
|
print(res)
|
||||||
|
np.save('outputs/cluster.npy', res)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
c = ClusterStat()
|
c = ClusterStat()
|
||||||
c.stat()
|
c.stat()
|
||||||
|
c.output()
|
||||||
BIN
outputs/cluster.npy
Normal file
BIN
outputs/cluster.npy
Normal file
Binary file not shown.
16
plot_cluster_size.py
Normal file
16
plot_cluster_size.py
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
"""
|
||||||
|
绘制cluster大小分布图
|
||||||
|
"""
|
||||||
|
from matplotlib import pyplot as plt
|
||||||
|
import numpy as np
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
data = np.load('outputs/cluster.npy')
|
||||||
|
fig = plt.figure(figsize=(4,3))
|
||||||
|
ax = fig.gca()
|
||||||
|
plt.bar(np.arange(len(data))+1, data)
|
||||||
|
ax.set_xlabel("Cluster Size")
|
||||||
|
ax.set_ylabel("Portion of Population")
|
||||||
|
plt.tight_layout()
|
||||||
|
plt.show()
|
||||||
31
sb_variant.py
Normal file
31
sb_variant.py
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
"""
|
||||||
|
sb策略以及变种在15轮时的团体平均收益
|
||||||
|
"""
|
||||||
|
|
||||||
|
import numpy as np
|
||||||
|
from matplotlib import pyplot as plt
|
||||||
|
|
||||||
|
x = np.arange(0,1,0.0001)
|
||||||
|
omega = np.ceil(5/(3-(x*2.6)))
|
||||||
|
fb0 = 5-omega*(3-(x*2.6+(1-x)*4.5))
|
||||||
|
fb = fb0 - (15-omega)*(3-2.6)
|
||||||
|
y = fb/2
|
||||||
|
|
||||||
|
ymax = 0
|
||||||
|
xmax = 0
|
||||||
|
for i in range(len(x)):
|
||||||
|
if y[i] > ymax:
|
||||||
|
ymax = y[i]
|
||||||
|
xmax = x[i]
|
||||||
|
print(xmax, ymax)
|
||||||
|
exit()
|
||||||
|
fig = plt.figure(figsize=(6.4,3.6))
|
||||||
|
ax = fig.gca()
|
||||||
|
ax.plot(x,y, marker='.', markersize=3, color='#0984e3', linestyle='None')
|
||||||
|
ax.plot(x,np.full(x.shape, 1.4), linestyle='dashed', linewidth=1, color='#aaaaaa')
|
||||||
|
ax.set_xlim(0,1)
|
||||||
|
# ax.set_ylim(0,2)
|
||||||
|
ax.set_xlabel(r'$p$')
|
||||||
|
ax.set_ylabel(r'$f_b(15)$')
|
||||||
|
plt.tight_layout()
|
||||||
|
plt.show()
|
||||||
77
sb_vs_human.py
Normal file
77
sb_vs_human.py
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
"""
|
||||||
|
sb策略和真人收益对比，其中分别比较sb0,sb0.2,所有人平均，获胜者平均，获胜者最高，统计10-15共6组
|
||||||
|
"""
|
||||||
|
import json
|
||||||
|
import numpy as np
|
||||||
|
import math
|
||||||
|
from matplotlib import pyplot as plt
|
||||||
|
from island.matches import Matches
|
||||||
|
from island.match import Match
|
||||||
|
|
||||||
|
human_avg = np.zeros(6)
|
||||||
|
human_count = np.zeros(6)
|
||||||
|
winner_avg = np.zeros(6)
|
||||||
|
winner_count = np.zeros(6)
|
||||||
|
winner_max = np.zeros(6)
|
||||||
|
|
||||||
|
"""
|
||||||
|
omega = np.ceil(5/(3-(x*2.6)))
|
||||||
|
fb0 = 5-omega*(3-(x*2.6+(1-x)*4.5))
|
||||||
|
fb = fb0 - (15-omega)*(3-2.6)
|
||||||
|
y = fb/2
|
||||||
|
"""
|
||||||
|
r = np.arange(10, 16)
|
||||||
|
x = 0.1924
|
||||||
|
|
||||||
|
sb0 = (8 - 0.4 * (r - 2)) / 2
|
||||||
|
o = math.ceil(5 / (3 - (x * 2.6)))
|
||||||
|
sb1 = (5 - o * (3 - (x * 2.6 + (1 - x) * 4.5)) - 0.4 * (r - o)) / 2
|
||||||
|
|
||||||
|
for m in Matches.from_profile('SURVIVE').data:
|
||||||
|
info = m.query('game', 'created').select('info').first()['info']
|
||||||
|
conf = json.loads(info['config'])
|
||||||
|
game_end_at = int(info['game_end_at'])
|
||||||
|
foods = {}
|
||||||
|
for p in m.query('player', 'join').select('pid').raw_data:
|
||||||
|
foods[p['pid']] = conf['start_resource']
|
||||||
|
|
||||||
|
for i in range(1, game_end_at + 1):
|
||||||
|
for a in m.query('action', 'done').where(lambda x: x['rno'] == i).raw_data:
|
||||||
|
foods[a['a']] += conf['payoffs']["%s%s" % (a['act_a'], a['act_b'])][0] * a['tr'] / 1440.0
|
||||||
|
foods[a['b']] += conf['payoffs']["%s%s" % (a['act_a'], a['act_b'])][1] * a['tr'] / 1440.0
|
||||||
|
for j in foods.keys():
|
||||||
|
foods[j] -= conf['rounds']['consumption']
|
||||||
|
human_count += len(foods)
|
||||||
|
for j in foods.keys():
|
||||||
|
if foods[j] > 0:
|
||||||
|
winner_avg[game_end_at - 10] += foods[j]
|
||||||
|
human_avg[game_end_at - 10] += foods[j]
|
||||||
|
winner_count += 1
|
||||||
|
if foods[j] > winner_max[game_end_at - 10]:
|
||||||
|
winner_max[game_end_at - 10] = foods[j]
|
||||||
|
if foods[j] > 3:
|
||||||
|
print(m.name, j, foods[j])
|
||||||
|
|
||||||
|
human_avg /= human_count
|
||||||
|
winner_avg /= winner_count
|
||||||
|
|
||||||
|
idx = np.arange(6)
|
||||||
|
bw = 0.15
|
||||||
|
|
||||||
|
fig = plt.figure(figsize=(6.3,3.6))
|
||||||
|
ax = fig.gca()
|
||||||
|
|
||||||
|
ax.bar(idx-2*bw, sb0, bw, color='tomato', label='Sacrifice(n=4)')
|
||||||
|
ax.bar(idx-bw, sb1, bw, color='limegreen', label='Sacrifice Max(n=4)')
|
||||||
|
ax.bar(idx, human_avg, bw, color='blueviolet', label='Human Average')
|
||||||
|
ax.bar(idx+bw, winner_avg, bw, color='gold', label='Winner Average')
|
||||||
|
ax.bar(idx+2*bw, winner_max, bw, color='deepskyblue', label='Winner Max')
|
||||||
|
|
||||||
|
ax.set_ylabel('Average Fitness')
|
||||||
|
ax.set_xlabel('Match Ends At')
|
||||||
|
ax.set_xticks(idx + bw / 2)
|
||||||
|
ax.set_xticklabels(('10', '11', '12', '13', '14', '15'))
|
||||||
|
ax.legend()
|
||||||
|
fig.tight_layout()
|
||||||
|
plt.show()
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user