Skip to content
Snippets Groups Projects
Commit febcce80 authored by arnaud.devevey's avatar arnaud.devevey
Browse files

12h20

parent 868c8ae9
Branches
No related tags found
No related merge requests found
Pipeline #6095 failed
No preview for this file type
......@@ -50,7 +50,6 @@ int main(int argc, char **argv) {
/*
allocation_mémoire_et_initialisation_de_la_galaxie();
itérations_temporelles {
......@@ -94,11 +93,11 @@ Galaxy* create_and_init_galaxy(int nb_bodies, Box box, double delta_t) {
} else {
double m_i = random_mass();
Vector v_i = random_speed(r_i, m_i);
Vector r_i;
do {
r_i = random_position();
} while (!is_inside(box, r_i));
Vector v_i = random_speed(r_i, m_i);
temp = new_star_vel(r_i, v_i, *v_null, m_i, 0.0);
......
......@@ -62,6 +62,7 @@ void resize_galaxy(Galaxy* galaxy);
// fait les tests de toutes les librairies
void tests();
void tests_galaxy();
......
No preview for this file type
......@@ -20,6 +20,7 @@ typedef struct __quadtree {
/* * * * * * * * * * * * * * * * *
* *
* --- PROTOTYPES --- *
......
No preview for this file type
......@@ -131,19 +131,17 @@ Star* super_star(Star* list_stars, int selection, int size_list) {
}
Vector* resultante(Vector* list_stars, int size_list) {
Vector* resultante(Star** list_stars, int size_list) {
Vector* Fi = new_vec(0.0, 0.0);
for (int i = 0; i < size_list; i++) {
for (int j = 0; j < size_list; j++) {
if (j != i) {
/*
Vector* rj_ri = sub_vec(&(list_stars[j] -> pos), &(list_stars[i] -> pos));
int G_mi_mj = FORCE_GRAVITATION * list_stars[i] -> mass * list_stars[j] -> mass;
Vector* temp = mul_vec(rj_ri, G_mi_mj);
Fi = add_vec(Fi, temp);
*/
}
}
}
......
......@@ -48,7 +48,7 @@ void print_star(const Star* const star);
// retourne l'accélération d'une étoile d'après toutes les autres d'une liste
Vector* resultante(Vector* list_stars, int size_list);
Vector* resultante(Star** list_stars, int size_list);
// calcule la position de l'étoile après avoir subi la force résultante des autres vecteurs (deuxième loi de Newton)
void new_position(Star* star, Vector resultante);
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment