From 788319a3aaacd7dd23b0e0efb5f13c65cfcefa39 Mon Sep 17 00:00:00 2001
From: Benjamin-Sitbon <Benjaminsitbon@hotmail.com>
Date: Mon, 17 Jun 2019 22:53:16 +0200
Subject: [PATCH] quad tree
---
.idea/workspace.xml | 42 ++++++++++++++++++++++--------------------
galaxy_simulation | Bin 23208 -> 23328 bytes
galaxy_simulation.o | Bin 0 -> 2736 bytes
quad_tree.c | 15 ++++++---------
quad_tree.h | 6 +++---
quad_tree.o | Bin 0 -> 2624 bytes
6 files changed, 31 insertions(+), 32 deletions(-)
create mode 100644 galaxy_simulation.o
create mode 100644 quad_tree.o
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2dae3d7..09211f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,8 +10,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="43aff179-c306-46b9-b69f-eca5306fbf96" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/galaxy.c" beforeDir="false" afterPath="$PROJECT_DIR$/galaxy.c" afterDir="false" />
+ <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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -60,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="340">
+ <state relative-caret-position="442">
<caret line="95" column="73" selection-start-line="95" selection-start-column="73" selection-end-line="95" selection-end-column="73" />
</state>
</provider>
@@ -78,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="257">
- <caret line="17" column="81" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
+ <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>
</provider>
</entry>
@@ -87,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="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="51">
+ <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="28" />
</state>
</provider>
</entry>
@@ -126,12 +128,12 @@
<option value="$PROJECT_DIR$/galaxy.h" />
<option value="$PROJECT_DIR$/galaxy_simulation.c" />
<option value="$PROJECT_DIR$/makefile" />
- <option value="$PROJECT_DIR$/quad_tree.h" />
<option value="$PROJECT_DIR$/Box.h" />
<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.h" />
<option value="$PROJECT_DIR$/quad_tree.c" />
</list>
</option>
@@ -190,12 +192,12 @@
<option name="presentableId" value="Default" />
<updated>1559227081243</updated>
<workItem from="1559227084365" duration="53793000" />
- <workItem from="1560336527698" duration="39245000" />
+ <workItem from="1560336527698" duration="41593000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="93038000" />
+ <option name="totallyTimeSpent" value="95386000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -294,13 +296,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/galaxy.c">
- <provider selected="true" editor-type-id="text-editor">
- <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>
<entry file="file://$PROJECT_DIR$/Box.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1088">
@@ -315,17 +310,24 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/galaxy.c">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="442">
+ <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="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="51">
+ <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/quad_tree.c">
<provider selected="true" editor-type-id="text-editor">
- <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 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>
</provider>
</entry>
diff --git a/galaxy_simulation b/galaxy_simulation
index f134312622fc699f51d2495034d5e924a8a28818..53a5d8c91264adcf0c21cd771d196ee4b6c40eac 100644
GIT binary patch
delta 5751
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
E08;|oBme*a
delta 4895
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
V2cqyB%j82*W=z)tC;y640{~}CR|x<B
diff --git a/galaxy_simulation.o b/galaxy_simulation.o
new file mode 100644
index 0000000000000000000000000000000000000000..e91aab0eeaa6bed8fe3271f75c8bb51a648b6499
GIT binary patch
literal 2736
zcmb<-^>JfjWMqH=Mg}_u1P><4z)--BU^{@B4h*~uJPe^8oliZQ-#B#Ep7H1`J<wcx
zhKavbosogTqucd>NAm#=k8TE!UQ>_`kIv&SKy>SY(uf@(2AJp3>w4i6zW^^t;1j<9
zD~L|x*SML+uYn;BGvR;fi~pq${+HhPUwQ#zNb?bemm3)f*y@O|70IR(FgC=bPS+nE
z-L5}iRw1)r2jTS;55oA@8hBN5Ayk4{Cl50u<yXX)q!yPjl%*z@<QGBM#U+VQR(fJi
zVnroH6cj=*42cQ`h650R5B5-cKZCoovz3B|OKMVPVxEGTp0S>RuAzl?N@|j2si7uB
zK*7ks(A>b((2RkBK?I_afw3xxfw4k>QJROHV*(=sgA4-%gQVR-3B!?3ppD6ymyOwp
zk%yfFB#ae<l(H~<{EtnN8EXn-U|?oo#-^NsnSlj|I5@Rn$T2e@B~~O^W(Mr;WoBSQ
zQUzg(GB7X*A-NOmcLoLqDFy}x0f-V5(g26JISz409O9lh#Dj5&C*Tmzz#(3QL%bY^
zcoPnB255>b&de>%Ni50C&(lk0$W6@5V~BV6@pp3ciT8JN3w8~O4{>zzagApvE-6aR
zEr2KUVurlb^7y3u3WkEB%)AmX3n}G8q{~v1q0%5$T2X2$13X6*!yEw0G{p=I>d@F=
zVqjnZrHViQAwVB04oX4X3=9k~aa$yD9wc#4_=BWi=IDSp3=9l`P#Pv~0_7({X_&YT
zl%ENuVd5@Oej$_wxd&9{!Q2B1XOI*~oDa!8b3uX(3=A-HKz;)WEd>z_4B(uB?61v8
z;`~VF?1qZN%z^pqIGQ-j{b!)!AoqaMJItMTki-R%%m){qQ1=KSiT{DBhuI6#0}^5Z
z6%bJM$nF<H5*J1?M-3_tGe;U^2m=Fy9#kCUPGoazki<b{8_fL*P<<eCKp4tpV9+bB
z%q>YwV$drtDT2@$Fji4&PNH5(YDEcyUP@v~B7<I1aWR8lQ9gu|oS&PUnpeW0mzQ6X
zs^{((s#{!=n4Ha^2iBIF5ua9+n41c>he8I({UEQQmsqfh09H=HtO2Qou|YH_+(2Ok
zQx6gY;S(T11_lNVXrOR0Fn~)xScxeCQpCW(pavC3FR9znErO~?7Y3y}keTG_H-y>`
zbtcpn28Ir(MFDUT2m@pngasijq547PHADnL-hk@YgK*&_R2Uo<AVDXneh?cOv!Oc(
zDhbmM<uZgr^`k52fC^Z^6hdiq_Xk1q40`;1fF=l7Jb~g5q!)xiM#02E?txkb5{6?3
zsNfHf0tN;KP+sC>V1U<{F#RAg^tb~VVgXG*{U8n!h8hPK0p)*e`Z=IgHmp2_X+YNx
E0Q=)^djJ3c
literal 0
HcmV?d00001
diff --git a/quad_tree.c b/quad_tree.c
index 1acf696..9290e7a 100644
--- a/quad_tree.c
+++ b/quad_tree.c
@@ -14,30 +14,27 @@ quad_tree *create_quad_tree_from_galaxy(const galaxy *const g){
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);
-
+ return galaxy;
}
//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){
+ if(is_inside(n->b,s->pos_t) && n!=NULL){
if(n->children==NULL) {
if (n->is_empty) {
n->s = s;
n->is_empty = false;
} else {
box *zones = divide_in_four(n->b);
- node *childs = malloc(4 * sizeof(node *));
for (int i = 0; i < 4; i++) {
- childs[i]->b = zones[i];
- childs[i]->is_empty = true;
- insert_star(childs[i], n->s);
- insert_star(childs[i], s);
+ n->children[i]->b = zones[i];
+ n->children[i]->is_empty = true;
+ insert_star(n->children[i], n->s);
+ insert_star(n->children[i], s);
}
- n->children = childs;
n->s = NULL;
}
}else{
diff --git a/quad_tree.h b/quad_tree.h
index e127e38..724e49b 100644
--- a/quad_tree.h
+++ b/quad_tree.h
@@ -1,7 +1,4 @@
#include "galaxy.h"
-typedef struct quad_tree {
- node *root;
-} quad_tree;
typedef struct node {
struct node *children[4];
@@ -11,6 +8,9 @@ typedef struct node {
bool is_empty;
} node;
+typedef struct quad_tree {
+ node *root;
+} quad_tree;
void insert_star(node *n, star *s);
diff --git a/quad_tree.o b/quad_tree.o
new file mode 100644
index 0000000000000000000000000000000000000000..ed597436eecb23b7c35b28d1b994df80f00a0b64
GIT binary patch
literal 2624
zcmb<-^>JfjWMqH=Mg}_u1P><4z~I1+#0E1R7<d@C8A3fep9Xt0zlreZtX;96gMoqJ
z1xVJT)Aa=k?}10R>kE%=29NI06&~GQ0v??n3Lf2F5+0o%8XnzV3Lc#v1|Ho(8Xlbi
z7Eq<f90C}jOpoIZ4q#)!hDfCGzd!JaU(j^}jIjg8H~?du@aT43@rhr+K?20^=yniD
z<JUOh(doM26Tg7#0<a^~JoxJlcyzj604V{f)c`R(x*Zg7tG)4wUm$hECw_t09iR9G
zLJxpU1KD-q6Tg7(jWquE|I_&2e@o-nc%8<taRb#pk4|R~u!owDL`26P1_hl*^BV(?
z&e|6qou!}<df?G5@QGi*g9D`Oe}TpS0)zhr8vhFvJUT-`HoM*cJKUrBh(gN&{+0wr
z1_qDj+7}G`EukPLD0Es6@VEYEU|;~5z`xBQpyfb`B#7<N9s0ndGr$4FKIRa>@KPD7
z1KAq5=^mY~AC9~J0fqU?sZi6pL;rXrU-IZ?xd3H#Ui3Klkkz9*^n(ZEDUWV0Xq<9D
z;}jIfpg5I)#VJ%<H_HV?)IuE8?fb_g`J_iT%L$LpYaX4)A@1mQeSy#daX(zL+4T=&
zbL}5y{=UTj|NnzL1xq8ZeZjnL2M>?#&=(%vK^~v@1-uME`akgtI2nB6k2v^=U(mte
zxa$v)|6YrOq`-O*b~n5JU~I1a!Cd!v!pXx7?#|9u3K}k{Ntuax3TAr7dIq|N7TPJP
zNtUICnh*g6BLhQo15-mYkdX`w3?fjPu_}mxu|j}RnuncZ0wV*10s{ks3{=h<l+hgd
z1lpLKdD&c>nVAh4dDuB1YQV{zfq`KqvKr<k5Cu^E*eH;47KV@ivB@!G&DjhL%nZ!f
zlru0hu;379!y%4TNFb?TW?)6)L72P@3=Bd@?g57d0|SE=0|SEqL<tHB3J+}J?l{y3
z;t-F6+6%J}9KH+;3|TnTm*5a*C@f7(i7zQiP1Q?gNG?iEEJ=-r3&p1u<>$tyC*~wp
zR5HZ7`}jLK`o#OYxdpq1#D_RK`MAb2<R<3i<R>%aW~Rg!<Y(rUFyy6{#}}6*7R8sP
z<}hUD6{i-JfcXrW#qpVW#hEFo3@MpqnJKC9nR)SP`K3jW;1PyU;F#iKU|{(39|9C{
zi0?oW=SEWh1c$f=C_ynWfX(MYQeTK9&W9v^9!Z=ZNj#hhVgZN(#XZcOB_II?1_ls?
zEPfdzfJGdXe?TUIq(K<O24NQv0aXtYhs7_0UU6k^Nn#R%UU5kggwBAmic)hD^-5AJ
zN*MG~5=#;p^pc8;8T69#b8}PkN*MI=@=H?n-2Fmzi%Sxdvl;Zj%2PAq(~1&vQ=!&T
zOo99Z3NrK@1xoKA!=HdW17biiNG+5Jrlg^915*zcWME)80L^kApaPr>4B*@bs-Zzb
z5+H(sfk6!_j$Q(&pbJ3NquZ~;z`y`96J0s6`VFD>8$iv6Q84{_FaanHvmZuVLG?qW
z;ZzX1gP<}neNZlgKU6<jFf&9z^(Vj-LTQj+p-eF4g(LhoKqD09FHrb{N=KM}Sonk7
zgKjs-;2lu=8$b#e7#Ki#8>AP6LGm#DAakKgLBeos0geA=xCn#+H4egIU|<kr0G0o6
RE}ZcI>i$T$2!w&I9{|x_^!We)
literal 0
HcmV?d00001
--
GitLab