From 2d498de6c105e57c32c9048e5901955556ab38bf Mon Sep 17 00:00:00 2001 From: Peter Mikkelsen Date: Thu, 13 Jan 2022 20:33:51 +0000 Subject: =?UTF-8?q?Implement=20dyadic=20(integer=20only)=20version=20of=20?= =?UTF-8?q?+=20-=20=C3=97=20=C3=B7=20*=20=E2=8D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 120 insertions(+), 6 deletions(-) (limited to 'functions.c') diff --git a/functions.c b/functions.c index bbac1a9..db9fe01 100644 --- a/functions.c +++ b/functions.c @@ -62,12 +62,12 @@ fnmonad monadfunctiondefs[] = { }; fndyad dyadfunctiondefs[] = { - 0, /* + */ - 0, /* - */ - 0, /* × */ - 0, /* ÷ */ - 0, /* * */ - 0, /* ⍟ */ + fnPlus, /* + */ + fnMinus, /* - */ + fnTimes, /* × */ + fnDivide, /* ÷ */ + fnPower, /* * */ + fnLogarithm, /* ⍟ */ 0, /* ⌹ */ 0, /* ○ */ 0, /* ! */ @@ -188,6 +188,120 @@ fnShape(Array *right) /* Dyadic functions */ +Array * +fnPlus(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] += rightarr->intdata[i]; + freearray(leftarr); + freearray(rightarr); + return res; +} + +Array * +fnMinus(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] -= rightarr->intdata[i]; + freearray(leftarr); + freearray(rightarr); + return res; +} + +Array * +fnTimes(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] *= rightarr->intdata[i]; + freearray(leftarr); + freearray(rightarr); + return res; +} + +Array * +fnDivide(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] /= rightarr->intdata[i]; + freearray(leftarr); + freearray(rightarr); + return res; +} + +Array * +fnPower(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] = pow(res->intdata[i], rightarr->intdata[i]); + freearray(leftarr); + freearray(rightarr); + return res; +} + +Array * +fnLogarithm(Array *left, Array *right) +{ + Array *leftarr; + Array *rightarr; + int rankok = scalarextend(left, right, &leftarr, &rightarr); + if(!rankok){ + print("Ranks don't match lol\n"); + exits(nil); + } + + Array *res = duparray(leftarr); + for(int i = 0; i < leftarr->size; i++) + res->intdata[i] = log(rightarr->intdata[i])/log(res->intdata[i]); + freearray(leftarr); + freearray(rightarr); + return res; +} + Array * fnLeft(Array *left, Array *right) { -- cgit v1.2.3