diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f91a09f61d4b1a15914a605909a5fd1b33a4990f..5740fe74efe449302cbe172a73c3538414a284ce 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,9 +11,7 @@ <component name="ChangeListManager"> <list default="true" id="43aff179-c306-46b9-b69f-eca5306fbf96" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/galaxy_simulation" beforeDir="false" afterPath="$PROJECT_DIR$/galaxy_simulation" afterDir="false" /> <change beforePath="$PROJECT_DIR$/quad_tree.c" beforeDir="false" afterPath="$PROJECT_DIR$/quad_tree.c" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/quad_tree.o" beforeDir="false" afterPath="$PROJECT_DIR$/quad_tree.o" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -80,8 +78,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/quad_tree.c"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" /> + <state relative-caret-position="529"> + <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" /> </state> </provider> </entry> @@ -98,8 +96,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/galaxy_simulation.c"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" /> + <state relative-caret-position="408"> + <caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" /> </state> </provider> </entry> @@ -193,12 +191,12 @@ <updated>1559227081243</updated> <workItem from="1559227084365" duration="53793000" /> <workItem from="1560336527698" duration="42232000" /> - <workItem from="1560855054651" duration="914000" /> + <workItem from="1560855054651" duration="2105000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="96939000" /> + <option name="totallyTimeSpent" value="98130000" /> </component> <component name="ToolWindowManager"> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> @@ -290,13 +288,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/galaxy.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="340"> - <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/makefile"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="119"> @@ -306,29 +297,36 @@ </entry> <entry file="file://$PROJECT_DIR$/galaxy_simulation.c"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="68"> - <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" /> + <state relative-caret-position="408"> + <caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/galaxy.c"> + <entry file="file://$PROJECT_DIR$/quad_tree.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1615"> - <caret line="95" column="73" selection-start-line="95" selection-start-column="73" selection-end-line="95" selection-end-column="73" /> + <state relative-caret-position="340"> + <caret line="20" selection-start-line="20" selection-end-line="20" selection-end-column="33" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/quad_tree.h"> + <entry file="file://$PROJECT_DIR$/galaxy.h"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="340"> - <caret line="20" selection-start-line="20" selection-end-line="20" selection-end-column="33" /> + <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/galaxy.c"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1615"> + <caret line="95" column="73" selection-start-line="95" selection-start-column="73" selection-end-line="95" selection-end-column="73" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/quad_tree.c"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" /> + <state relative-caret-position="529"> + <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" /> </state> </provider> </entry> diff --git a/quad_tree.c b/quad_tree.c index 85bfd8971d3f8fc35cb100c1324c4d9e76243f8b..4db241c3ec44caae977a920ce17283200a663678 100644 --- a/quad_tree.c +++ b/quad_tree.c @@ -46,15 +46,3 @@ void insert_star(node *n, star *s){ } } -void free_node(node *n){ - - free(n->super_s); - free(n->children); - free(n->s); - -} - -void free_quad_tree(quad_tree *t){ - - -} \ No newline at end of file