diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 09211f79dcc65327b043c61235feeed5e09c4128..f91a09f61d4b1a15914a605909a5fd1b33a4990f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,7 +13,7 @@
<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.h" beforeDir="false" afterPath="$PROJECT_DIR$/quad_tree.h" 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" />
@@ -44,7 +44,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Star.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
+ <state relative-caret-position="680">
<caret line="40" column="44" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
</state>
</provider>
@@ -62,7 +62,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
+ <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>
@@ -80,8 +80,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="342">
- <caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+ <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>
</provider>
</entry>
@@ -89,8 +89,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/quad_tree.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="28" />
+ <state relative-caret-position="340">
+ <caret line="20" selection-start-line="20" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
</entry>
@@ -108,7 +108,7 @@
<entry file="file://$PROJECT_DIR$/makefile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
- <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+ <caret line="7" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
@@ -139,8 +139,8 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="517" />
- <option name="y" value="132" />
+ <option name="x" value="516" />
+ <option name="y" value="131" />
<option name="width" value="1050" />
<option name="height" value="730" />
</component>
@@ -192,18 +192,19 @@
<option name="presentableId" value="Default" />
<updated>1559227081243</updated>
<workItem from="1559227084365" duration="53793000" />
- <workItem from="1560336527698" duration="41593000" />
+ <workItem from="1560336527698" duration="42232000" />
+ <workItem from="1560855054651" duration="914000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="95386000" />
+ <option name="totallyTimeSpent" value="96939000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25302014" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25637585" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@@ -261,24 +262,24 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/makefile">
+ <entry file="file://$PROJECT_DIR$/Box.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="119">
- <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+ <state relative-caret-position="1088">
+ <caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/galaxy_simulation.c">
+ <entry file="file://$PROJECT_DIR$/Box.h">
<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="187">
+ <caret line="11" column="37" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/galaxy.h">
+ <entry file="file://$PROJECT_DIR$/Star.c">
<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 relative-caret-position="680">
+ <caret line="40" column="44" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
</state>
</provider>
</entry>
@@ -289,45 +290,45 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Star.c">
+ <entry file="file://$PROJECT_DIR$/galaxy.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
- <caret line="40" column="44" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
+ <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$/Box.c">
+ <entry file="file://$PROJECT_DIR$/makefile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1088">
- <caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
+ <state relative-caret-position="119">
+ <caret line="7" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Box.h">
+ <entry file="file://$PROJECT_DIR$/galaxy_simulation.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="11" column="37" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
+ <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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
+ <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.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="28" />
+ <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.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+ <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>
</provider>
</entry>
diff --git a/galaxy_simulation b/galaxy_simulation
index 53a5d8c91264adcf0c21cd771d196ee4b6c40eac..c960ccb0d34f85a9c926fa109427f226513c7497 100644
Binary files a/galaxy_simulation and b/galaxy_simulation differ
diff --git a/quad_tree.c b/quad_tree.c
index 9290e7a45ba2befcc98141d01020e5e43a1ab84c..85bfd8971d3f8fc35cb100c1324c4d9e76243f8b 100644
--- a/quad_tree.c
+++ b/quad_tree.c
@@ -40,8 +40,21 @@ void insert_star(node *n, star *s){
}else{
n->super_s->mass += s->mass;
for (int i = 0; i < 4; i++) {
- insert_star(n->children,s);
+ insert_star(n->children[i],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
diff --git a/quad_tree.o b/quad_tree.o
index ed597436eecb23b7c35b28d1b994df80f00a0b64..bdfac5f7fbdb4163d2b7aa67c6334786853a7555 100644
Binary files a/quad_tree.o and b/quad_tree.o differ