Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3.training/git.practice!27

.gitlab-ci.yml

+image: schickling/octave
+
+test:
+    only:
+    - develop
+    - merge_requests
+
+    script:
+    - octave test/*.m

firstCommit/addTwoNumbers.m → src/firstCommit/addTwoNumbers_myName.m

-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

-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

-% 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

+% 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))