Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
phys_tp_elec
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
boris.stefanov
phys_tp_elec
Commits
5d3d4b0b
Commit
5d3d4b0b
authored
2 years ago
by
Boris Stefanovic
Browse files
Options
Downloads
Patches
Plain Diff
cleanup
parent
85da53d6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
Makefile
+3
-1
3 additions, 1 deletion
Makefile
src/field.c
+26
-42
26 additions, 42 deletions
src/field.c
src/field.h
+16
-8
16 additions, 8 deletions
src/field.h
utils/utils.c
+30
-20
30 additions, 20 deletions
utils/utils.c
utils/utils.h
+20
-10
20 additions, 10 deletions
utils/utils.h
with
96 additions
and
81 deletions
.gitignore
+
1
−
0
View file @
5d3d4b0b
...
...
@@ -2,3 +2,4 @@
build
*.o
*.pdf
main
This diff is collapsed.
Click to expand it.
Makefile
+
3
−
1
View file @
5d3d4b0b
CC
:=
gcc
CFLAGS
:=
-g
-O3
-Wall
-Wextra
-fsanitize
=
address
-fsanitize
=
leak
-std
=
gnu11
LDFLAGS
:=
-lm
LDFLAGS
:=
-lm
VPATH
:=
utils utils/vec2 utils/gfx src
OBJFILES
:=
vec2.o utils.o field.o draw.o gfx.o
TESTS
:=
draw_tests field_tests
all
:
main
main
:
main.o $(OBJFILES)
$(
CC
)
$(
CFLAGS
)
-o
$@
$^
$(
LDFLAGS
)
-lSDL2
...
...
This diff is collapsed.
Click to expand it.
src/field.c
+
26
−
42
View file @
5d3d4b0b
#include
<stdbool.h>
#include
<stdlib.h>
#include
<time.h>
#include
"draw.h"
#include
"field.h"
#include
"draw.h"
#include
"../utils/utils.h"
#define SIGN_SIZE 10
#define CHARGE_R 25
// Compute E*qP/norm(qP)
// Return false if norm(qP) < eps
/// qP = vectoriel(P-q)
/// Compute the vector value of the field generated by a charge at a given point in space.
bool
compute_e
(
charge_t
c
,
vec2
p
,
double
eps
,
vec2
*
e
)
{
vec2
relative_position
=
vec2_sub
(
p
,
c
.
pos
);
if
(
vec2_norm
(
relative_position
)
<
eps
)
return
false
;
...
...
@@ -22,8 +15,7 @@ bool compute_e(charge_t c, vec2 p, double eps, vec2 *e) {
return
true
;
}
// Compute the normalized sum of Ei*qiP/norm(qiP)
// Return false if for some qiP, norm(qiP) < eps
bool
compute_total_normalized_e
(
charge_t
*
charges
,
int
num_charges
,
vec2
p
,
double
eps
,
vec2
*
e
)
{
*
e
=
vec2_create_zero
();
vec2
ei
=
vec2_create_zero
();
...
...
@@ -35,38 +27,33 @@ bool compute_total_normalized_e(charge_t *charges, int num_charges, vec2 p, doub
return
true
;
}
double
compute_delta_x
(){
double
compute_delta_x
()
{
double
result
=
pow
(
WID
,
2
)
+
pow
(
HEI
,
2
);
result
=
sqrt
(
result
);
return
1
/
result
;
}
bool
is_in_screen
(
coordinates_t
pos
){
if
(
pos
.
column
>
WID
)
return
false
;
if
(
pos
.
row
>
HEI
)
return
false
;
return
true
;
bool
is_in_screen
(
coordinates_t
pos
)
{
// TODO: should this not be "<" instead of "<=" ?
return
pos
.
column
<=
WID
&&
pos
.
row
<=
HEI
;
}
bool
draw_field_line_point
(
struct
gfx_context_t
*
ctxt
,
charge_t
*
charges
,
int
num_charges
,
double
x0
,
double
x1
,
double
y0
,
double
y1
,
vec2
pos
,
vec2
*
pos_next
,
double
delta
){
bool
draw_field_line_point
(
struct
gfx_context_t
*
ctxt
,
charge_t
*
charges
,
int
num_charges
,
double
x0
,
double
x1
,
double
y0
,
double
y1
,
vec2
pos
,
vec2
*
pos_next
,
double
delta
)
{
vec2
e
;
compute_total_normalized_e
(
charges
,
num_charges
,
pos
,
0
.
01
,
&
e
);
double
norm_e
=
vec2_norm
(
e
);
// Problème ici
//
TODO: "
Problème ici
" ?
pos_next
->
x
=
pos
.
x
+
delta
*
(
e
.
x
/
norm_e
);
pos_next
->
y
=
pos
.
y
+
delta
*
(
e
.
y
/
norm_e
);
if
(
pos_next
->
x
<=
0
||
pos_next
->
x
>=
1
||
pos_next
->
y
<=
0
||
pos_next
->
y
>=
1
)
if
(
pos_next
->
x
<=
0
||
pos_next
->
x
>=
1
||
pos_next
->
y
<=
0
||
pos_next
->
y
>=
1
)
return
false
;
coordinates_t
coordinate_pos
=
position_to_coordinates
(
WID
,
HEI
,
x0
,
x1
,
y0
,
y1
,
pos
);
coordinates_t
coordinate_pos_next
=
position_to_coordinates
(
WID
,
HEI
,
x0
,
x1
,
y0
,
y1
,
*
pos_next
);
if
(
coordinate_pos_next
.
column
<=
0
||
coordinate_pos_next
.
row
<=
0
)
if
(
coordinate_pos_next
.
column
<=
0
||
coordinate_pos_next
.
row
<=
0
)
return
false
;
gfx_draw_line
(
ctxt
,
coordinate_pos
,
coordinate_pos_next
,
COLOR_YELLOW
);
...
...
@@ -74,9 +61,9 @@ bool draw_field_line_point(struct gfx_context_t *ctxt, charge_t *charges, int nu
return
!
is_in_screen
(
coordinate_pos
);
}
bool
line_reach_charge
(
vec2
pos
,
charge_t
*
charges
,
double
num_charges
,
double
dx
){
for
(
int
j
=
0
;
j
<
num_charges
;
j
++
)
{
if
(
vec2_norm
(
vec2_sub
(
pos
,
charges
[
j
].
pos
))
<
dx
/
HEI
){
bool
line_reach_charge
(
vec2
pos
,
charge_t
*
charges
,
int
num_charges
,
double
dx
)
{
for
(
int
j
=
0
;
j
<
num_charges
;
++
j
)
{
if
(
vec2_norm
(
vec2_sub
(
pos
,
charges
[
j
].
pos
))
<
dx
/
HEI
)
{
return
true
;
}
}
...
...
@@ -84,10 +71,10 @@ bool line_reach_charge(vec2 pos, charge_t * charges, double num_charges, double
}
// Compute and then draw all the points belonging to a field line,
// starting from pos0.
// Returns false if pos0 is not a valid position
// (for example if pos0 is too close to a charge).
//
/
Compute and then draw all the points belonging to a field line,
//
/
starting from pos0.
//
/
Returns false if pos0 is not a valid position
//
/
(for example if pos0 is too close to a charge).
static
bool
draw_field_line
(
struct
gfx_context_t
*
ctxt
,
charge_t
*
charges
,
int
num_charges
,
double
dx
,
vec2
pos0
,
double
x0
,
double
x1
,
double
y0
,
double
y1
)
{
vec2
pos_positive
=
vec2_create
(
pos0
.
x
,
pos0
.
y
);
vec2
pos_negative
=
vec2_create
(
pos0
.
x
,
pos0
.
y
);
...
...
@@ -97,18 +84,17 @@ static bool draw_field_line(struct gfx_context_t *ctxt, charge_t *charges, int n
bool
stop_negative
=
false
;
// * 5 à supprimer lorsque le code est optimisé
double
delta
=
compute_delta_x
();
int
max_for
=
100000
;
for
(
int
i
=
0
;
i
<
max_for
&&
(
!
stop_positive
||
!
stop_negative
);
i
++
)
{
int
max_for
=
100000
;
for
(
int
i
=
0
;
i
<
max_for
&&
(
!
stop_positive
||
!
stop_negative
);
i
++
)
{
stop_positive
=
line_reach_charge
(
pos_positive
,
charges
,
num_charges
,
dx
);
stop_negative
=
line_reach_charge
(
pos_negative
,
charges
,
num_charges
,
dx
);
if
(
!
stop_positive
){
if
(
!
stop_positive
)
{
stop_positive
=
draw_field_line_point
(
ctxt
,
charges
,
num_charges
,
x0
,
x1
,
y0
,
y1
,
pos_positive
,
&
pos_next_positive
,
delta
);
pos_positive
=
pos_next_positive
;
}
if
(
!
stop_negative
){
if
(
!
stop_negative
)
{
stop_negative
=
draw_field_line_point
(
ctxt
,
charges
,
num_charges
,
x0
,
x1
,
y0
,
y1
,
pos_negative
,
&
pos_next_negative
,
-
delta
);
pos_negative
=
pos_next_negative
;
}
...
...
@@ -117,12 +103,11 @@ static bool draw_field_line(struct gfx_context_t *ctxt, charge_t *charges, int n
return
!
stop_positive
||
!
stop_negative
;
}
// Draw all the charges
// A circle with minus sign for negative charges
// A circle with a plus sign for positive charges
//
/
Draw all the charges
//
/
A circle with minus sign for negative charges
//
/
A circle with a plus sign for positive charges
static
void
draw_charges
(
struct
gfx_context_t
*
context
,
charge_t
*
charges
,
int
num_charges
,
double
x0
,
double
x1
,
double
y0
,
double
y1
)
{
for
(
int
i
=
0
;
i
<
num_charges
;
i
++
)
{
for
(
int
i
=
0
;
i
<
num_charges
;
i
++
)
{
coordinates_t
charge_center
=
position_to_coordinates
(
WID
,
HEI
,
x0
,
x1
,
y0
,
y1
,
charges
[
i
].
pos
);
gfx_draw_circle
(
context
,
charge_center
,
CHARGE_R
,
COLOR_WHITE
);
...
...
@@ -152,7 +137,6 @@ void draw_everything(
double
dx
,
double
x0
,
double
x1
,
double
y0
,
double
y1
)
{
srand
(
time
(
NULL
));
draw_charges
(
ctxt
,
charges
,
num_charges
,
x0
,
x1
,
y0
,
y1
);
for
(
int
i
=
0
;
i
<
num_lines
;
++
i
)
{
vec2
pos0
=
vec2_create
(
rand_one
(),
rand_one
());
...
...
This diff is collapsed.
Click to expand it.
src/field.h
+
16
−
8
View file @
5d3d4b0b
#ifndef _PHYSIQUE_H_
#define _PHYSIQUE_H_
#include
"../utils/vec2/vec2.h"
#include
"../utils/gfx/gfx.h"
#include
"../utils/utils.h"
#include
<stdio.h>
#include
"../utils/utils.h"
#include
"../utils/gfx/gfx.h"
#include
"../utils/vec2/vec2.h"
#define SIDE_LEN 1000
#define WID SIDE_LEN
#define HEI WID
// Compute E*qP/norm(qP)
// Return false if norm(qP) < eps
/// Compute E*qP/norm(qP)
/// Return false if norm(qP) < eps
/// Compute the vector value of the field generated by a charge at a given point in space.
/// qP = vectoriel(P-q)
bool
compute_e
(
charge_t
c
,
vec2
p
,
double
eps
,
vec2
*
e
);
// Compute the normalized sum of Ei*qiP/norm(qiP)
// Return false if for some qiP, norm(qiP) < eps
/// Compute the normalized sum of Ei*qiP/norm(qiP)
/// Return false if for some qiP, norm(qiP) < eps
bool
compute_total_normalized_e
(
charge_t
*
charges
,
int
num_charges
,
vec2
p
,
double
eps
,
vec2
*
e
);
bool
line_reach_charge
(
vec2
pos
,
charge_t
*
charges
,
double
num_charges
,
double
dx
);
bool
line_reach_charge
(
vec2
pos
,
charge_t
*
charges
,
int
num_charges
,
double
dx
);
bool
is_in_screen
(
coordinates_t
pos
);
void
draw_everything
(
struct
gfx_context_t
*
ctxt
,
charge_t
*
charges
,
...
...
@@ -31,4 +38,5 @@ void draw_everything(
double
x0
,
double
x1
,
double
y0
,
double
y1
);
#endif
This diff is collapsed.
Click to expand it.
utils/utils.c
+
30
−
20
View file @
5d3d4b0b
#include
"vec2/vec2.h"
#include
"utils.h"
#include
<math.h>
#include
<stdlib.h>
#include
<time.h>
#include
"utils.h"
#include
"vec2/vec2.h"
coordinates_t
coordinates_create
(
int
row_
,
int
column_
)
{
coordinates_t
c
=
{.
row
=
row_
,
.
column
=
column_
};
return
c
;
}
coordinates_t
coordinates_create
(
int
row_
,
int
column_
)
{
coordinates_t
c
=
{.
row
=
row_
,
.
column
=
column_
}
;
return
c
;
coordinates_t
position_to_coordinates
(
int
width
,
int
height
,
double
x0
,
double
x1
,
double
y0
,
double
y1
,
vec2
pos
)
{
double
dx
=
x1
-
x0
;
double
dy
=
y1
-
y0
;
return
coordinates_create
((
int
)
round
(
height
*
(
pos
.
y
-
y0
)
/
dy
),
(
int
)
round
(
width
*
(
pos
.
x
-
x0
)
/
dx
))
;
}
// Transform a position in the univers [x0,y0]x[x1,y1] to a screen position
coordinates_t
position_to_coordinates
(
int
width
,
int
height
,
double
x0
,
double
x1
,
double
y0
,
double
y1
,
vec2
pos
)
{
double
dx
=
x1
-
x0
;
double
dy
=
y1
-
y0
;
return
coordinates_create
((
int
)
round
(
height
*
(
pos
.
y
-
y0
)
/
dy
),
(
int
)
round
(
width
*
(
pos
.
x
-
x0
)
/
dx
));
int
rand_num
()
{
static
bool
rand_initialised
=
false
;
if
(
!
rand_initialised
)
{
srand
(
time
(
NULL
));
rand_initialised
=
true
;
}
return
rand
();
}
double
rand_one
()
{
return
(
double
)
rand
()
/
(
double
)
RAND_MAX
;
double
rand_one
()
{
return
(
double
)
rand
_num
()
/
(
double
)
RAND_MAX
;
}
charge_t
charge_create
(
double
q
,
vec2
pos
)
{
charge_t
c
=
{.
q
=
q
,
.
pos
=
pos
};
return
c
;
}
\ No newline at end of file
charge_t
charge_create
(
double
q
,
vec2
pos
)
{
charge_t
c
=
{.
q
=
q
,
.
pos
=
pos
};
return
c
;
}
This diff is collapsed.
Click to expand it.
utils/utils.h
+
20
−
10
View file @
5d3d4b0b
...
...
@@ -2,29 +2,39 @@
#define _UTILS_H_
#include
<stdint.h>
#include
"vec2/vec2.h"
static
const
double
K
=
8.988e9
;
static
const
double
E
=
1.602e-19
;
typedef
struct
{
uint32_t
row
;
uint32_t
column
;
typedef
struct
{
uint32_t
row
;
uint32_t
column
;
}
coordinates_t
;
typedef
struct
{
double
q
;
vec2
pos
;
typedef
struct
{
double
q
;
vec2
pos
;
}
charge_t
;
coordinates_t
coordinates_create
(
int
row_
,
int
column_
);
// Transform a position in the univers [x0,y0]x[x1,y1] to a screen position
/// transform a position in the universe [x0,y0]x[x1,y1] to a screen position
coordinates_t
position_to_coordinates
(
int
width
,
int
height
,
double
x0
,
double
x1
,
double
y0
,
double
y1
,
vec2
pos
);
int
rand_num
();
double
rand_one
();
charge_t
charge_create
(
double
q
,
vec2
pos
);
#endif
\ No newline at end of file
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment