Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Nikola de Lange
git.practice
Commits
80caa1af
Commit
80caa1af
authored
Jan 22, 2019
by
Laurent Heirendt
✈
Browse files
Merge branch 'develop' into 'master'
Regular merge of develop See merge request R3.training/git.practice!27
parents
83c316d0
e72f42c4
Changes
5
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
0 → 100644
View file @
80caa1af
image
:
schickling/octave
test
:
only
:
-
develop
-
merge_requests
script
:
-
octave test/*.m
firstCommit/addTwoNumbers.m
→
src/
firstCommit/addTwoNumbers
_myName
.m
View file @
80caa1af
function
c
=
addTwoNumbers
(
a
,
b
)
function
c
=
addTwoNumbers
_myName
(
a
,
b
)
% addTwoNumbers(a, b) returns the sum of a and b
%
c = a + b;
c
=
a
+
b
;
end
secondCommit/multiplyTwoNumbers.m
→
src/
secondCommit/multiplyTwoNumbers
_myName
.m
View file @
80caa1af
function
c
=
multiplyTwoNumbers
(
a
,
b
)
function
c
=
multiplyTwoNumbers
_myName
(
a
,
b
)
% multiplyTwoNumbers(a, b) returns the product of a and b
%
c = a * b;
c
=
a
*
b
;
end
test/test.m
deleted
100644 → 0
View file @
83c316d0
% Test file
addpath
(
genpath
(
pwd
))
% add this folder and all subfolders to the path
c
=
addTwoNumbers_myName
(
1
,
1
);
% 1 + 1
d
=
multiplyTwoNumbers_myName
(
c
,
c
);
% 2 * 2
% test my sqrt function
assert
(
sqrt_myName
(
d
)
==
sqrt
(
d
))
test/test_myName.m
0 → 100644
View file @
80caa1af
% Test file
addpath
(
genpath
(
'src/'
))
% add this folder and all subfolders to the path
c
=
addTwoNumbers_myName
(
1
,
2
)
d
=
multiplyTwoNumbers_myName
(
c
,
c
)
% test my sqrt function
% assert(sqrt_myName(d) == sqrt(d))
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment