From 8fbf58e12859d75c7f4922a0d9e0d4161b1f6e55 Mon Sep 17 00:00:00 2001 From: Benjamin-Sitbon <Benjaminsitbon@hotmail.com> Date: Mon, 3 Jun 2019 08:26:23 +0200 Subject: [PATCH] Box Start Begin of the box fonctions --- .idea/workspace.xml | 69 +++++++++++++++++++++++++-------- Box | Bin 0 -> 13688 bytes Box.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ Box.h | 20 ++++++++++ Box.o | Bin 0 -> 10680 bytes Vector | Bin 13528 -> 13528 bytes Vector.c | 18 +-------- Vector.o | Bin 8312 -> 8312 bytes makefile | 6 ++- 9 files changed, 169 insertions(+), 34 deletions(-) create mode 100644 Box create mode 100644 Box.c create mode 100644 Box.h create mode 100644 Box.o diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0d5d0a7..0834939 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,7 +10,10 @@ </component> <component name="ChangeListManager"> <list default="true" id="43aff179-c306-46b9-b69f-eca5306fbf96" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/Vector" beforeDir="false" afterPath="$PROJECT_DIR$/Vector" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Vector.c" beforeDir="false" afterPath="$PROJECT_DIR$/Vector.c" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/Vector.o" beforeDir="false" afterPath="$PROJECT_DIR$/Vector.o" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/makefile" beforeDir="false" afterPath="$PROJECT_DIR$/makefile" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -20,20 +23,38 @@ </component> <component name="FileEditorManager"> <leaf> - <file pinned="false" current-in-tab="true"> + <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="342"> - <caret line="211" column="97" selection-start-line="211" selection-start-column="97" selection-end-line="211" selection-end-column="97" /> + <state relative-caret-position="920"> + <caret line="210" lean-forward="true" selection-start-line="210" selection-end-line="210" /> </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="85"> + <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="33" /> + </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="391"> - <caret line="23" selection-start-line="23" selection-end-line="23" selection-end-column="34" /> + <caret line="56" column="33" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Box.h"> + <provider selected="true" editor-type-id="text-editor"> + <state> + <caret column="18" selection-start-column="18" selection-end-column="18" /> </state> </provider> </entry> @@ -41,8 +62,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/makefile"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="30" selection-start-line="3" selection-start-column="30" selection-end-line="3" selection-end-column="30" /> + <state> + <caret column="15" selection-start-column="15" selection-end-column="15" /> </state> </provider> </entry> @@ -59,11 +80,13 @@ <option value="$PROJECT_DIR$/Vector_Test.h" /> <option value="$PROJECT_DIR$/Vector_Test.c" /> <option value="$PROJECT_DIR$/makefile" /> + <option value="$PROJECT_DIR$/Box.h" /> <option value="$PROJECT_DIR$/Vector.c" /> + <option value="$PROJECT_DIR$/Box.c" /> </list> </option> </component> - <component name="ProjectFrameBounds" extendedState="7"> + <component name="ProjectFrameBounds" extendedState="6"> <option name="x" value="848" /> <option name="y" value="317" /> <option name="width" value="1050" /> @@ -115,12 +138,12 @@ <option name="number" value="Default" /> <option name="presentableId" value="Default" /> <updated>1559227081243</updated> - <workItem from="1559227084365" duration="16429000" /> + <workItem from="1559227084365" duration="25870000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="16429000" /> + <option name="totallyTimeSpent" value="25870000" /> </component> <component name="ToolWindowManager"> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> @@ -181,22 +204,36 @@ </entry> <entry file="file://$PROJECT_DIR$/makefile"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="30" selection-start-line="3" selection-start-column="30" selection-end-line="3" selection-end-column="30" /> + <state> + <caret column="15" selection-start-column="15" selection-end-column="15" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Vector.h"> + <entry file="file://$PROJECT_DIR$/Box.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="391"> - <caret line="23" selection-start-line="23" selection-end-line="23" selection-end-column="34" /> + <state> + <caret column="18" selection-start-column="18" selection-end-column="18" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/Vector.c"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="342"> - <caret line="211" column="97" selection-start-line="211" selection-start-column="97" selection-end-line="211" selection-end-column="97" /> + <state relative-caret-position="920"> + <caret line="210" lean-forward="true" selection-start-line="210" selection-end-line="210" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Vector.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="85"> + <caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="33" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Box.c"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="391"> + <caret line="56" column="33" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" /> </state> </provider> </entry> diff --git a/Box b/Box new file mode 100644 index 0000000000000000000000000000000000000000..e7a51acc7eb153c6786d6dc8f969c37bd5a9fca1 GIT binary patch literal 13688 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 literal 0 HcmV?d00001 diff --git a/Box.c b/Box.c new file mode 100644 index 0000000..503aa71 --- /dev/null +++ b/Box.c @@ -0,0 +1,90 @@ +#include <stdio.h> +#include <stdlib.h> +#include <stdbool.h> +#include "Box.h" +#include <math.h> + +box new_box(double x0, double x1, double y0, double y1){ + + box new_box; + //On vérifie que l'allocation est bien faite + if (new_vec == NULL){ + exit(1); + } + //Attribution des valeurs + new_box.x0 = x0; + new_box.y0 = y0; + new_box.x1 = x1; + new_box.y1 = y1; + + return new_box; + +} + +bool is_inside(box b, vec *v){ + + //Vérification des valeurs du vecteur dans les intervalles de la box + if(v->x >= b.x0 && v->x <= b.x1 && v->y >= b.y0 && v->y <= b.y1){ + + return true; + } + else{ + return false; + } +} + + +//TEST FONCTIONS// + +int Test_new_box(){ + + box b = new_box(1.0,1.0,2.0,2.0); + if(b.x0 == 1.0 && b.x1 == 1.0 && b.y0 == 2.0 && b.y1 == 2.0){ + printf("Test_new_box IS OK\n"); + } + else{ + printf("Test_new_box has an ERROR\n"); + } +} + +int Test_is_inside(){ + + box b = new_box(-1.0,1.0,-2.0,2.0); + vec *v1 = new_vec(0.5,1.5); + vec *v2 = new_vec(1.0,2.5); + + bool test1 = is_inside(b,v1); + bool test2 = is_inside(b,v2); + + if(test1 && !test2){ + printf("Test_is_inside IS OK\n"); + } + else{ + printf("Test_is_inside has an ERROR\n"); + } + free(v1); + free(v2); +} + +int box_tests(){ + Test_new_box(); + Test_is_inside(); +} + +int main(int argc, char *argv[]){ + if(argc == 2) { + if (strcmp(argv[1], "box_test") == 0) { + box_tests(); + } + else if(strcmp(argv[1], "vector_test") == 0){ + vector_tests(); + vec *v = new_vec(1.0,2.0); + print_vec(v); + free(v); + } + } + else{ + + } + +} \ No newline at end of file diff --git a/Box.h b/Box.h new file mode 100644 index 0000000..450d084 --- /dev/null +++ b/Box.h @@ -0,0 +1,20 @@ +#include "Vector.c" +typedef struct box { + double x0, x1, y0, y1; +} box; + +//Création d’une nouvelle box +box new_box(double x0, double x1, double y0, double y1); + +//Division d’une box en quatre parties égales +box *divide_in_four(box b); + +//Déterminer si une position est à l’intérieur de la box +bool is_inside(box b, vec *v); + +//Déterminer la taille maximale d’un des côtés de la box +double compute_length(box b); + +//Affiche la box +void print_box(box b); + diff --git a/Box.o b/Box.o new file mode 100644 index 0000000000000000000000000000000000000000..d0d6dd02196d093b5813914099b23515a7e1ea48 GIT binary patch literal 10680 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 T^b3Fz76SuAB1jPuM%NDjg8^#J literal 0 HcmV?d00001 diff --git a/Vector b/Vector index 7bb7f35b4a87245360f4ca39e7dc53655bde6886..5baf464ab329f6ea248824298a294a82772035ee 100644 GIT binary patch delta 40 xcmcbSc_VW}3zNv!x4Sb~8V{*0+I^4bOUT~4`CIajZl1xkk&iKLvzK6>G61q&6R`jQ delta 40 wcmcbSc_VW}3zNvN!jFY4dCu?UMYVVA<arZedxW=h^9-hqe2giZy#)J|0fBW9B>(^b diff --git a/Vector.c b/Vector.c index 1e12caf..e30a356 100644 --- a/Vector.c +++ b/Vector.c @@ -198,7 +198,7 @@ int Test_distance(){ } //Fonction regroupant tout les tests -int main_tests(){ +int vector_tests(){ Test_new_vec(); Test_add_vec(); @@ -209,19 +209,3 @@ int main_tests(){ } -//On peut choisir de faire les tests ou d'afficher un vecteur quelconque si on lance le programme -int main(int argc, char *argv[]){ - if(argc == 2) { - if (strcmp(argv[1], "test") == 0) { - - main_tests(); - - } - } - else{ - vec *v = new_vec(1.0,2.0); - print_vec(v); - free(v); - } - -} diff --git a/Vector.o b/Vector.o index d777c6f61e9eff81b7c792df869df487af011a34..93485b83284c520123b61091cdd80eeb88f51f49 100644 GIT binary patch delta 14 Vcmez2@WWw)AqQjHW+M(a2>>sJ1q=WH delta 14 Vcmez2@WWw)AqQj1W+M(a2>>s71quKF diff --git a/makefile b/makefile index cbd7c6a..22b7ef8 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,10 @@ -All: Vector +All: Vector Box Vector: Vector.o gcc -o Vector Vector.o -lm Vector.o: Vector.c gcc -o Vector.o -c Vector.c +Box: Box.o + gcc -o Box Box.o -lm +Box.o: Box.c + gcc -o Box.o -c Box.c \ No newline at end of file -- GitLab