Commit 80caa1af authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3.training/git.practice!27
parents 83c316d0 e72f42c4
Pipeline #8400 failed with stage
image: schickling/octave
test:
only:
- develop
- merge_requests
script:
- octave test/*.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
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 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 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))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment