diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b346c3d0eb88413c7e4c154cb1af1e65f2ad388e..2dae3d778f0dfc6c42133f3e42344c7e915e5d46 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,10 +10,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="43aff179-c306-46b9-b69f-eca5306fbf96" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/Box.c" beforeDir="false" afterPath="$PROJECT_DIR$/Box.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Star.c" beforeDir="false" afterPath="$PROJECT_DIR$/Star.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Star.h" beforeDir="false" afterPath="$PROJECT_DIR$/Star.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/galaxy.c" beforeDir="false" afterPath="$PROJECT_DIR$/galaxy.c" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/quad_tree.c" beforeDir="false" afterPath="$PROJECT_DIR$/quad_tree.c" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -59,11 +57,11 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <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">
- <caret line="95" column="74" selection-start-line="95" selection-start-column="74" selection-end-line="95" selection-end-column="74" />
+ <state relative-caret-position="340">
+ <caret line="95" column="73" selection-start-line="95" selection-start-column="73" selection-end-line="95" selection-end-column="73" />
</state>
</provider>
</entry>
@@ -77,11 +75,11 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
+ <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="155">
- <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+ <state relative-caret-position="257">
+ <caret line="17" column="81" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
</state>
</provider>
</entry>
@@ -130,11 +128,11 @@
<option value="$PROJECT_DIR$/makefile" />
<option value="$PROJECT_DIR$/quad_tree.h" />
<option value="$PROJECT_DIR$/Box.h" />
- <option value="$PROJECT_DIR$/quad_tree.c" />
<option value="$PROJECT_DIR$/Box.c" />
<option value="$PROJECT_DIR$/Star.h" />
<option value="$PROJECT_DIR$/Star.c" />
<option value="$PROJECT_DIR$/galaxy.c" />
+ <option value="$PROJECT_DIR$/quad_tree.c" />
</list>
</option>
</component>
@@ -192,12 +190,12 @@
<option name="presentableId" value="Default" />
<updated>1559227081243</updated>
<workItem from="1559227084365" duration="53793000" />
- <workItem from="1560336527698" duration="38917000" />
+ <workItem from="1560336527698" duration="39245000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="92710000" />
+ <option name="totallyTimeSpent" value="93038000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -275,13 +273,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Box.h">
- <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>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/galaxy.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
@@ -289,24 +280,24 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/quad_tree.c">
+ <entry file="file://$PROJECT_DIR$/Star.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="155">
- <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+ <state relative-caret-position="153">
+ <caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/quad_tree.h">
+ <entry file="file://$PROJECT_DIR$/Star.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+ <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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Star.h">
+ <entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="9" selection-start-line="9" selection-end-line="9" />
+ <state relative-caret-position="340">
+ <caret line="95" column="73" selection-start-line="95" selection-start-column="73" selection-end-line="95" selection-end-column="73" />
</state>
</provider>
</entry>
@@ -317,17 +308,24 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Star.c">
+ <entry file="file://$PROJECT_DIR$/Box.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="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.c">
+ <entry file="file://$PROJECT_DIR$/quad_tree.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="238">
+ <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/quad_tree.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="95" column="74" selection-start-line="95" selection-start-column="74" selection-end-line="95" selection-end-column="74" />
+ <state relative-caret-position="257">
+ <caret line="17" column="81" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
</state>
</provider>
</entry>
diff --git a/galaxy.c b/galaxy.c
index 86074177b322350f00fcd10f8aeccd792110b138..186e7464c5dd150000b60c3a8f1c0932df58b131 100644
--- a/galaxy.c
+++ b/galaxy.c
@@ -93,7 +93,7 @@ void resize_galaxy(galaxy *g){
}
//On remplace le tableau
g->stars = tab;
- //Et on change la variable du nombre d'étoile pour qu'elle soit juste
+ //Et on change la variable du nombre d'étoile pour qu'elle soit juste
g->num_bodies = new_size;
}
diff --git a/quad_tree.c b/quad_tree.c
index fcbe613f215caa2860f2b9732390e0744fd0ac58..1acf6967976f2851502fbbb567f63531ba4899d0 100644
--- a/quad_tree.c
+++ b/quad_tree.c
@@ -7,16 +7,20 @@
quad_tree *create_quad_tree_from_galaxy(const galaxy *const g){
+ //Allocation du quad_tree et du noeud racine
quad_tree* galaxy = malloc(sizeof(quad_tree*));
node *root = malloc(sizeof(node*));
+ //Attribution des valeurs nécéssaire
galaxy->root->b = g->b;
galaxy->root->is_empty = true;
galaxy->root->s = NULL;
galaxy->root->children = NULL;
+ //Création de la super étoile avec un masse null et placé au centre de la box
galaxy->root->super_s = new_star_vel((vec){mid_point(g->b.x0,g->b.x1),mid_point(g->b.y0,g->b.y1)},(vec){0.0,0.0},(vec){0.0,0.0},0.0,0.0);
}
+//Suit à la lettre la fonction décrite dans l'énoncé
void insert_star(node *n, star *s){
if(is_inside(n->b,s) && n!=NULL){