Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Galaxy_Simulator
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
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
benjamin.sitbon
Galaxy_Simulator
Commits
9b718668
Commit
9b718668
authored
6 years ago
by
Benjamin-Sitbon
Browse files
Options
Downloads
Patches
Plain Diff
Vector Finish
Missing Comments
parent
818eca32
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
.idea/workspace.xml
+21
-22
21 additions, 22 deletions
.idea/workspace.xml
Vector
+0
-0
0 additions, 0 deletions
Vector
Vector.c
+89
-1
89 additions, 1 deletion
Vector.c
Vector.o
+0
-0
0 additions, 0 deletions
Vector.o
makefile
+1
-1
1 addition, 1 deletion
makefile
with
111 additions
and
24 deletions
.idea/workspace.xml
+
21
−
22
View file @
9b718668
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
<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$/Vector"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Vector"
afterDir=
"false"
/>
<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.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"
/>
<change
beforePath=
"$PROJECT_DIR$/Vector.o"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Vector.o"
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"
/>
<change
beforePath=
"$PROJECT_DIR$/makefile"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/makefile"
afterDir=
"false"
/>
</list>
</list>
...
@@ -28,7 +27,7 @@
...
@@ -28,7 +27,7 @@
<entry
file=
"file://$PROJECT_DIR$/Vector.c"
>
<entry
file=
"file://$PROJECT_DIR$/Vector.c"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"376"
>
<state
relative-caret-position=
"376"
>
<caret
line=
"
93
"
lean-forward=
"true"
selection-start-line=
"
93"
selection-end-line=
"93
"
/>
<caret
line=
"
74"
column=
"14
"
lean-forward=
"true"
selection-start-line=
"
74"
selection-start-column=
"14"
selection-end-line=
"74"
selection-end-column=
"14
"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -36,8 +35,8 @@
...
@@ -36,8 +35,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/Vector.h"
>
<entry
file=
"file://$PROJECT_DIR$/Vector.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
187
"
>
<state
relative-caret-position=
"
391
"
>
<caret
line=
"
11
"
selection-start-line=
"
11
"
selection-end-line=
"
11
"
selection-end-column=
"
5
4"
/>
<caret
line=
"
23
"
selection-start-line=
"
23
"
selection-end-line=
"
23
"
selection-end-column=
"
3
4"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -45,8 +44,8 @@
...
@@ -45,8 +44,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<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=
"1
02
"
>
<state
relative-caret-position=
"
5
1"
>
<caret
line=
"
6"
lean-forward=
"true
"
selection-start-
line=
"6
"
selection-end-line=
"
6
"
/>
<caret
line=
"
3"
column=
"30"
selection-start-line=
"3
"
selection-start-
column=
"30
"
selection-end-line=
"
3"
selection-end-column=
"30
"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -60,16 +59,16 @@
...
@@ -60,16 +59,16 @@
<option
name=
"CHANGED_PATHS"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<list>
<option
value=
"$PROJECT_DIR$/Vector.h"
/>
<option
value=
"$PROJECT_DIR$/Vector.h"
/>
<option
value=
"$PROJECT_DIR$/makefile"
/>
<option
value=
"$PROJECT_DIR$/Vector_Test.h"
/>
<option
value=
"$PROJECT_DIR$/Vector_Test.h"
/>
<option
value=
"$PROJECT_DIR$/Vector_Test.c"
/>
<option
value=
"$PROJECT_DIR$/Vector_Test.c"
/>
<option
value=
"$PROJECT_DIR$/makefile"
/>
<option
value=
"$PROJECT_DIR$/Vector.c"
/>
<option
value=
"$PROJECT_DIR$/Vector.c"
/>
</list>
</list>
</option>
</option>
</component>
</component>
<component
name=
"ProjectFrameBounds"
extendedState=
"
7
"
>
<component
name=
"ProjectFrameBounds"
extendedState=
"
6
"
>
<option
name=
"x"
value=
"
681
"
/>
<option
name=
"x"
value=
"
848
"
/>
<option
name=
"y"
value=
"3
3
"
/>
<option
name=
"y"
value=
"3
17
"
/>
<option
name=
"width"
value=
"1050"
/>
<option
name=
"width"
value=
"1050"
/>
<option
name=
"height"
value=
"730"
/>
<option
name=
"height"
value=
"730"
/>
</component>
</component>
...
@@ -119,12 +118,12 @@
...
@@ -119,12 +118,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1559227081243
</updated>
<updated>
1559227081243
</updated>
<workItem
from=
"1559227084365"
duration=
"
7898
000"
/>
<workItem
from=
"1559227084365"
duration=
"
15096
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
7898
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
15096
000"
/>
</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"
/>
...
@@ -169,13 +168,6 @@
...
@@ -169,13 +168,6 @@
<entry
file=
"file://$PROJECT_DIR$/../C/Projet/makefile"
>
<entry
file=
"file://$PROJECT_DIR$/../C/Projet/makefile"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/makefile"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"102"
>
<caret
line=
"6"
lean-forward=
"true"
selection-start-line=
"6"
selection-end-line=
"6"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Vector_Test.h"
>
<entry
file=
"file://$PROJECT_DIR$/Vector_Test.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"17"
>
<state
relative-caret-position=
"17"
>
...
@@ -190,17 +182,24 @@
...
@@ -190,17 +182,24 @@
</state>
</state>
</provider>
</provider>
</entry>
</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>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Vector.h"
>
<entry
file=
"file://$PROJECT_DIR$/Vector.h"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
187
"
>
<state
relative-caret-position=
"
391
"
>
<caret
line=
"
11
"
selection-start-line=
"
11
"
selection-end-line=
"
11
"
selection-end-column=
"
5
4"
/>
<caret
line=
"
23
"
selection-start-line=
"
23
"
selection-end-line=
"
23
"
selection-end-column=
"
3
4"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Vector.c"
>
<entry
file=
"file://$PROJECT_DIR$/Vector.c"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"376"
>
<state
relative-caret-position=
"376"
>
<caret
line=
"
93
"
lean-forward=
"true"
selection-start-line=
"
93"
selection-end-line=
"93
"
/>
<caret
line=
"
74"
column=
"14
"
lean-forward=
"true"
selection-start-line=
"
74"
selection-start-column=
"14"
selection-end-line=
"74"
selection-end-column=
"14
"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
This diff is collapsed.
Click to expand it.
Vector
+
0
−
0
View file @
9b718668
No preview for this file type
This diff is collapsed.
Click to expand it.
Vector.c
+
89
−
1
View file @
9b718668
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
#include
<stdlib.h>
#include
<stdlib.h>
#include
<stdbool.h>
#include
<stdbool.h>
#include
"Vector.h"
#include
"Vector.h"
#include
<math.h>
vec
*
new_vec
(
double
x
,
double
y
){
vec
*
new_vec
(
double
x
,
double
y
){
...
@@ -40,6 +41,43 @@ vec *sub_vec(const vec *const v1, const vec *const v2){
...
@@ -40,6 +41,43 @@ vec *sub_vec(const vec *const v1, const vec *const v2){
}
}
vec
*
mul_vec
(
double
alpha
,
const
vec
*
const
v2
)
{
vec
*
mul_vec
=
new_vec
(
0
.
0
,
0
.
0
);
mul_vec
->
x
=
alpha
*
v2
->
x
;
mul_vec
->
y
=
alpha
*
v2
->
y
;
return
mul_vec
;
}
double
norm
(
const
vec
*
const
v1
){
double
norm
=
pow
((
pow
(
v1
->
x
,
2
.
0
)
+
pow
(
v1
->
y
,
2
.
0
)),
0
.
5
);
return
norm
;
}
double
distance
(
const
vec
*
const
v1
,
const
vec
*
const
v2
){
double
dist
=
pow
(
pow
((
v2
->
x
-
v1
->
x
),
2
.
0
)
+
pow
((
v2
->
y
-
v1
->
y
),
2
.
0
),
0
.
5
);
return
dist
;
}
void
print_vec
(
const
vec
*
const
v
){
printf
(
"{"
);
printf
(
"%f"
,
v
->
x
);
printf
(
"}
\n
"
);
printf
(
"{"
);
printf
(
"%f"
,
v
->
y
);
printf
(
"}
\n
"
);
}
int
Test_new_vec
(){
int
Test_new_vec
(){
...
@@ -88,13 +126,61 @@ int Test_sub_vec(){
...
@@ -88,13 +126,61 @@ int Test_sub_vec(){
free
(
v3
);
free
(
v3
);
}
}
int
Test_mul_vec
(){
vec
*
mul
=
new_vec
(
2
.
5
,
5
.
0
);
mul
=
mul_vec
(
2
,
mul
);
if
(
mul
->
x
==
5
.
0
&&
mul
->
y
==
10
.
0
){
printf
(
"Test_mul_vec IS OK
\n
"
);
}
else
{
printf
(
"Test_mul_vec has an ERROR
\n
"
);
}
free
(
mul
);
}
int
Test_norm
(){
vec
*
v1
=
new_vec
(
8
,
6
);
double
test
=
norm
(
v1
);
if
(
test
==
10
){
printf
(
"Test_norm IS OK
\n
"
);
}
else
{
printf
(
"Test_norm has an ERROR
\n
"
);
}
free
(
v1
);
}
int
Test_distance
(){
vec
*
v1
=
new_vec
(
1
.
0
,
1
.
0
);
vec
*
v2
=
new_vec
(
2
.
0
,
1
.
0
);
double
test
=
distance
(
v1
,
v2
);
if
(
test
==
1
.
0
){
printf
(
"Test_distance IS OK
\n
"
);
}
else
{
printf
(
"Test_distance has an ERROR
\n
"
);
}
free
(
v1
);
free
(
v2
);
}
int
main_tests
(){
int
main_tests
(){
Test_new_vec
();
Test_new_vec
();
Test_add_vec
();
Test_add_vec
();
Test_sub_vec
();
Test_sub_vec
();
Test_mul_vec
();
Test_norm
();
Test_distance
();
}
}
...
@@ -108,7 +194,9 @@ int main(int argc, char *argv[]){
...
@@ -108,7 +194,9 @@ int main(int argc, char *argv[]){
}
}
}
}
else
{
else
{
printf
(
"OK
\n
"
);
vec
*
v
=
new_vec
(
1
.
0
,
2
.
0
);
print_vec
(
v
);
free
(
v
);
}
}
}
}
This diff is collapsed.
Click to expand it.
Vector.o
+
0
−
0
View file @
9b718668
No preview for this file type
This diff is collapsed.
Click to expand it.
makefile
+
1
−
1
View file @
9b718668
All
:
Vector
All
:
Vector
Vector
:
Vector.o
Vector
:
Vector.o
gcc
-o
Vector Vector.o
gcc
-o
Vector Vector.o
-lm
Vector.o
:
Vector.c
Vector.o
:
Vector.c
gcc
-o
Vector.o
-c
Vector.c
gcc
-o
Vector.o
-c
Vector.c
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