Commit e2998fe9 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'master' into 'develop'

Master

See merge request !19
parents c4c1d72d 9e1fbef7
function c = addTwoNumbers(a, b)
% addTwoNumbers(a, b) returns the sum of a and b
c = a + b;
end
function c = addTwoNumbers_StefaniaMagnusdottir(a, b)
% addTwoNumbers(a, b) returns the sum of a and b
c = a + b;
end
function c = addTwoNumbers_hulda(a, b)
% addTwoNumbers(a, b) returns the sum of a and b
c = a + b;
end
function c = addTwoNumbers(a, b)
% addTwoNumbers(a, b) returns the sum of a and b
c = a + b;
end
function c = addTwoNumbers_miguel(a, b)
% addTwoNumbers(a, b) returns the sum of a and b
c = a + b;
end
function c = multiplyTwoNumbers_StefaniaMagnusdottir(a, b)
% multiplyTwoNumbers(a, b) returns the product of a and b
c = a * b;
end
function c = multiplyTwoNumbers(a, b)
% multiplyTwoNumbers(a, b) returns the product of a and b
c = a * b;
end
function s = sqrt_jenn(a)
s = sqrt(a);
end
% Test file
addpath(genpath(pwd)) % add this folder and all subfolders to the path
c = addTwoNumbers_jenn(1, 1); % 1 + 1
d = multiplyTwoNumbers_jenn(c, c); % 2 * 2
% test my sqrt function
assert(sqrt_jenn(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