diff --git a/lib/.idea/workspace.xml b/lib/.idea/workspace.xml
index c2fba8688c3bb651721c818cc71af26f45ef1df7..47112c92db2311bf9976682c637b0c7a94e6dd53 100755
--- a/lib/.idea/workspace.xml
+++ b/lib/.idea/workspace.xml
@@ -6,12 +6,12 @@
<component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
<generated>
<config projectName="project" targetName="star_tests" />
- <config projectName="project" targetName="galaxy" />
<config projectName="project" targetName="galaxy_tests" />
<config projectName="project" targetName="quad_tree_tests" />
<config projectName="project" targetName="vector_tests" />
- <config projectName="project" targetName="box_tests" />
<config projectName="project" targetName="node_tests" />
+ <config projectName="project" targetName="box_tests" />
+ <config projectName="project" targetName="galaxy" />
</generated>
</component>
<component name="CMakeSettings">
@@ -22,13 +22,8 @@
<component name="ChangeListManager">
<list default="true" id="66aa4989-1799-4160-8419-e9cbdc309215" 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.c" beforeDir="false" afterPath="$PROJECT_DIR$/galaxy.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node.c" beforeDir="false" afterPath="$PROJECT_DIR$/node.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/quad_tree.c" beforeDir="false" afterPath="$PROJECT_DIR$/quad_tree.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/star.c" beforeDir="false" afterPath="$PROJECT_DIR$/star.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/vector.c" beforeDir="false" afterPath="$PROJECT_DIR$/vector.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/vector.h" beforeDir="false" afterPath="$PROJECT_DIR$/vector.h" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -48,7 +43,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-163">
+ <state relative-caret-position="270">
<caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
<folding>
<element signature="e#0#18#0" expanded="true" />
@@ -57,11 +52,20 @@
</provider>
</entry>
</file>
+ <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="660">
+ <caret line="50" column="32" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/node.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="362">
- <caret line="68" column="7" selection-start-line="64" selection-end-line="68" selection-end-column="7" />
+ <state relative-caret-position="1140">
+ <caret line="80" column="25" lean-forward="true" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
</state>
</provider>
</entry>
@@ -69,8 +73,8 @@
<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="92">
- <caret line="99" column="1" lean-forward="true" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" />
+ <state relative-caret-position="208">
+ <caret line="99" column="1" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" />
<folding>
<element signature="e#40#59#0" expanded="true" />
</folding>
@@ -81,8 +85,8 @@
<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="870">
- <caret line="58" column="42" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
+ <state relative-caret-position="553">
+ <caret line="76" lean-forward="true" selection-start-line="76" selection-end-line="76" />
<folding>
<element signature="e#41#60#0" expanded="true" />
</folding>
@@ -91,19 +95,10 @@
</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="774">
- <caret line="49" selection-start-line="49" selection-end-line="49" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/box.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="645">
- <caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
+ <state relative-caret-position="298">
+ <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" />
<folding>
<element signature="e#41#60#0" expanded="true" />
</folding>
@@ -112,19 +107,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/quad_tree_tests.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" selection-start-line="2" selection-end-line="4" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/box_tests.c">
+ <entry file="file://$PROJECT_DIR$/vector.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="3" selection-start-line="3" selection-end-line="3" />
+ <state relative-caret-position="-62">
+ <caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
@@ -142,7 +128,7 @@
</split-first>
<split-second>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/box.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
@@ -155,15 +141,6 @@
</entry>
</file>
<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="195">
- <caret line="17" selection-start-line="17" selection-end-line="17" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/galaxy.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -228,9 +205,9 @@
<option value="$PROJECT_DIR$/main.c" />
<option value="$PROJECT_DIR$/vector.c" />
<option value="$PROJECT_DIR$/vector.h" />
- <option value="$PROJECT_DIR$/node.c" />
<option value="$PROJECT_DIR$/galaxy.c" />
<option value="$PROJECT_DIR$/star.c" />
+ <option value="$PROJECT_DIR$/node.c" />
<option value="$PROJECT_DIR$/quad_tree.c" />
</list>
</option>
@@ -371,7 +348,8 @@
<workItem from="1560617598372" duration="602000" />
<workItem from="1560630172137" duration="556000" />
<workItem from="1560786024968" duration="1037000" />
- <workItem from="1560804972006" duration="6160000" />
+ <workItem from="1560804972006" duration="6248000" />
+ <workItem from="1560835151095" duration="355000" />
</task>
<task id="LOCAL-00001" summary="update general">
<created>1560551622745</created>
@@ -387,17 +365,24 @@
<option name="project" value="LOCAL" />
<updated>1560630726321</updated>
</task>
- <option name="localTasksCounter" value="3" />
+ <task id="LOCAL-00003" summary="commentaire">
+ <created>1560811281384</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1560811281384</updated>
+ </task>
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="65839000" />
+ <option name="totallyTimeSpent" value="66282000" />
</component>
<component name="ToolWindowManager">
<frame x="67" y="25" width="1853" height="1055" extended-state="6" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11510792" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.044825677" />
<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" />
@@ -409,7 +394,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
- <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.24190065" />
+ <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.116630666" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="CMake" order="11" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.3261339" />
@@ -428,7 +413,8 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="update general" />
- <option name="LAST_COMMIT_MESSAGE" value="update general" />
+ <MESSAGE value="commentaire" />
+ <option name="LAST_COMMIT_MESSAGE" value="commentaire" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/enonce/Makefile" />
@@ -465,20 +451,20 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Makefile">
+ <entry file="file://$PROJECT_DIR$/main.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="30" column="211" selection-start-line="30" selection-start-column="211" selection-end-line="30" selection-end-column="211" />
+ <state relative-caret-position="270">
+ <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+ <folding>
+ <element signature="e#0#18#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/box.h">
+ <entry file="file://$PROJECT_DIR$/Makefile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
- <folding>
- <element signature="e#102#121#0" expanded="true" />
- </folding>
+ <state relative-caret-position="450">
+ <caret line="30" column="211" selection-start-line="30" selection-start-column="211" selection-end-line="30" selection-end-column="211" />
</state>
</provider>
</entry>
@@ -496,26 +482,29 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/vector.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="17" selection-start-line="17" selection-end-line="17" />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/vector_tests.c">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/galaxy.h">
<provider selected="true" editor-type-id="text-editor" />
</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="870">
- <caret line="58" column="42" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
+ <state relative-caret-position="330">
+ <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
<folding>
- <element signature="e#41#60#0" expanded="true" />
+ <element signature="e#102#121#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/box_tests.c">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="45">
+ <caret line="3" selection-start-line="3" selection-end-line="3" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/quad_tree_tests.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -523,34 +512,44 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/box_tests.c">
+ <entry file="file://$PROJECT_DIR$/vector.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="3" selection-start-line="3" selection-end-line="3" />
+ <state relative-caret-position="-62">
+ <caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/main.c">
+ <entry file="file://$PROJECT_DIR$/box.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-163">
- <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+ <state relative-caret-position="298">
+ <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="4" />
<folding>
- <element signature="e#0#18#0" expanded="true" />
+ <element signature="e#41#60#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/star.c">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="553">
+ <caret line="76" lean-forward="true" selection-start-line="76" selection-end-line="76" />
+ <folding>
+ <element signature="e#41#60#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="362">
- <caret line="68" column="7" selection-start-line="64" selection-end-line="68" selection-end-column="7" />
+ <state relative-caret-position="1140">
+ <caret line="80" column="25" lean-forward="true" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/galaxy.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
- <caret line="99" column="1" lean-forward="true" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" />
+ <state relative-caret-position="208">
+ <caret line="99" column="1" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" />
<folding>
<element signature="e#40#59#0" expanded="true" />
</folding>
@@ -559,18 +558,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/quad_tree.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="774">
- <caret line="49" selection-start-line="49" selection-end-line="49" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/box.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="645">
- <caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
- <folding>
- <element signature="e#41#60#0" expanded="true" />
- </folding>
+ <state relative-caret-position="660">
+ <caret line="50" column="32" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
</state>
</provider>
</entry>
diff --git a/lib/node.c b/lib/node.c
index 4eba6d9be4fcc5fb4b3df4342d6ed565eed0947c..e077e690ccc49c6d32218da37205667f900ab74b 100755
--- a/lib/node.c
+++ b/lib/node.c
@@ -75,7 +75,7 @@ star *creat_super_star(star *s1, star *s2) {
vec *vel = new_vec(0.0, 0.0);
star *super_star = new_star_vel(pos_t, vel, new_vec(0.0, 0.0), mass_tot, 1e10);
- //free
+ //liberation memoire
free_vec(vel);
free_vec(d1_mult_m1);
free_vec(d2_mult_m2);
diff --git a/lib/quad_tree.c b/lib/quad_tree.c
index 1a04ac50dca3e7ce79290bd9b0620b71a3f1891c..8eeebb0ca5f6a98b3aec0b2e77b5c8b885bda76b 100755
--- a/lib/quad_tree.c
+++ b/lib/quad_tree.c
@@ -48,6 +48,7 @@ void insert_star(node *n, star *s) {
insert_star(n->children[i], s);
}
+ //liberation memoire
free_vec(r_s);
free_vec(r_ss);
free_vec(vec_tmp);
@@ -68,7 +69,7 @@ quad_tree *create_quad_tree_from_galaxy(galaxy *g) {
return new_quad_tree;
}
-void free_quad_tree(quad_tree *t) {
+void free_quad_tree(quad_tree *t) { //liberation memoire
assert(t != NULL);
free_node(t->root);
free(t);