Skip to content
Snippets Groups Projects
Commit 802ff3c3 authored by Benjamin-Sitbon's avatar Benjamin-Sitbon
Browse files

quad tree

parent b31b1a83
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,18 @@ ...@@ -9,7 +9,18 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="43aff179-c306-46b9-b69f-eca5306fbf96" name="Default Changelist" comment="" /> <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$/Box.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Star.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Vector.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/galaxy.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/galaxy_simulation.c" beforeDir="false" afterPath="$PROJECT_DIR$/galaxy_simulation.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/galaxy_simulation.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/makefile" beforeDir="false" afterPath="$PROJECT_DIR$/makefile" 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="EXCLUDED_CONVERTED_TO_IGNORED" 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" />
...@@ -18,29 +29,11 @@ ...@@ -18,29 +29,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Vector.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-542">
<caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Vector.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="53" selection-start-line="9" selection-start-column="53" selection-end-line="9" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Box.c"> <entry file="file://$PROJECT_DIR$/Box.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1632"> <state relative-caret-position="272">
<caret line="111" selection-start-line="111" selection-end-line="111" /> <caret line="55" column="40" lean-forward="true" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -75,8 +68,8 @@ ...@@ -75,8 +68,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/galaxy.c"> <entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223"> <state>
<caret line="120" column="8" selection-start-line="120" selection-start-column="8" selection-end-line="120" selection-end-column="8" /> <caret selection-end-line="4" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -93,17 +86,35 @@ ...@@ -93,17 +86,35 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/galaxy_simulation.c"> <entry file="file://$PROJECT_DIR$/galaxy_simulation.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="68">
<caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" /> <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/quad_tree.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="49" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/makefile"> <entry file="file://$PROJECT_DIR$/makefile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="51">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> <caret line="3" column="71" selection-start-line="3" selection-start-column="71" selection-end-line="3" selection-end-column="71" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -122,12 +133,14 @@ ...@@ -122,12 +133,14 @@
<option value="$PROJECT_DIR$/Vector.c" /> <option value="$PROJECT_DIR$/Vector.c" />
<option value="$PROJECT_DIR$/Star.c" /> <option value="$PROJECT_DIR$/Star.c" />
<option value="$PROJECT_DIR$/Star.h" /> <option value="$PROJECT_DIR$/Star.h" />
<option value="$PROJECT_DIR$/galaxy_simulation.c" />
<option value="$PROJECT_DIR$/makefile" />
<option value="$PROJECT_DIR$/Box.h" /> <option value="$PROJECT_DIR$/Box.h" />
<option value="$PROJECT_DIR$/Box.c" />
<option value="$PROJECT_DIR$/galaxy.h" /> <option value="$PROJECT_DIR$/galaxy.h" />
<option value="$PROJECT_DIR$/galaxy.c" /> <option value="$PROJECT_DIR$/galaxy.c" />
<option value="$PROJECT_DIR$/galaxy_simulation.c" />
<option value="$PROJECT_DIR$/Box.c" />
<option value="$PROJECT_DIR$/makefile" />
<option value="$PROJECT_DIR$/quad_tree.c" />
<option value="$PROJECT_DIR$/quad_tree.h" />
</list> </list>
</option> </option>
</component> </component>
...@@ -185,12 +198,12 @@ ...@@ -185,12 +198,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1559227081243</updated> <updated>1559227081243</updated>
<workItem from="1559227084365" duration="53793000" /> <workItem from="1559227084365" duration="53793000" />
<workItem from="1560336527698" duration="28820000" /> <workItem from="1560336527698" duration="32701000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="82613000" /> <option name="totallyTimeSpent" value="86494000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
...@@ -254,13 +267,6 @@ ...@@ -254,13 +267,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/galaxy_simulation.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Star.c"> <entry file="file://$PROJECT_DIR$/Star.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833"> <state relative-caret-position="833">
...@@ -284,15 +290,22 @@ ...@@ -284,15 +290,22 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Box.c"> <entry file="file://$PROJECT_DIR$/Box.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1632"> <state relative-caret-position="272">
<caret line="111" selection-start-line="111" selection-end-line="111" /> <caret line="55" column="40" lean-forward="true" selection-start-line="55" selection-start-column="40" selection-end-line="55" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/makefile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="71" selection-start-line="3" selection-start-column="71" selection-end-line="3" selection-end-column="71" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/galaxy.c"> <entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223"> <state>
<caret line="120" column="8" selection-start-line="120" selection-start-column="8" selection-end-line="120" selection-end-column="8" /> <caret selection-end-line="4" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -303,10 +316,24 @@ ...@@ -303,10 +316,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/makefile"> <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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/quad_tree.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="49" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/quad_tree.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="238">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" /> <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
File deleted
File deleted
File deleted
File deleted
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <math.h> #include <math.h>
#include "galaxy.h" #include "quad_tree.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if (argc == 2) { if (argc == 2) {
......
File deleted
galaxy_simulation: vector.o Box.o Star.o galaxy.o galaxy_simulation.o galaxy_simulation: vector.o Box.o Star.o galaxy.o quad_tree.o galaxy_simulation.o
gcc -o galaxy_simulation Vector.o Box.o Star.o galaxy.o galaxy_simulation.o -lm gcc -o galaxy_simulation Vector.o Box.o Star.o galaxy.o quad_tree.o galaxy_simulation.o -lm
galaxy_simulation.o: galaxy_simulation.c galaxy_simulation.o: galaxy_simulation.c
gcc -o galaxy_simulation.o -c galaxy_simulation.c gcc -o galaxy_simulation.o -c galaxy_simulation.c
...@@ -14,5 +14,7 @@ Star.o: Star.c ...@@ -14,5 +14,7 @@ Star.o: Star.c
gcc -o Star.o -c Star.c gcc -o Star.o -c Star.c
galaxy.o: galaxy.c galaxy.o: galaxy.c
gcc -o galaxy.o -c galaxy.c gcc -o galaxy.o -c galaxy.c
quad_tree.o: quad_tree.c
gcc -o quad_tree.o -c quad_tree.c
clean: clean:
rm -f noise *.o *.gch rm -f noise *.o *.gch
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <math.h>
#include <time.h>
#include "quad_tree.h"
quad_tree *create_quad_tree_from_galaxy(const galaxy *const g){
quad_tree* galaxy = malloc(sizeof(quad_tree));
}
\ No newline at end of file
#include "galaxy.h"
typedef struct quad_tree {
node *root;
} quad_tree;
typedef struct node {
struct node *children[4];
box b;
star *s;
star *super_s;
bool is_empty;
} node;
void insert_star(node *n, star *s);
//Création du quad_tree:
quad_tree *create_quad_tree_from_galaxy(const galaxy *const g);
//Libération de la mémoire du quad_tree
void free_quad_tree(quad_tree *t);
//Mise à jour de l’accélération d’une étoile:
void update_acceleration_from_node(const node *const n, star *s,double theta);
//Mise à jour de l’accélération de toutes les étoiles:
void update_accelerations_of_all_stars(const node *const n,galaxy *g, double theta);
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment