From faaef032d866f956665653e58086af9872c3c093 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Wed, 11 Oct 2023 14:09:59 -0600
Subject: [PATCH] matrices

---
 homeworks/hw-4.org |  10 ++++++++++
 inc/lizfcm.h       |   3 +++
 inc/macros.h       |  28 +++++++++++++++++++++-------
 inc/types.h        |   6 ++++++
 lib/lizfcm.a       | Bin 9672 -> 11512 bytes
 src/matrix.c       |  22 ++++++++++++++++++++++
 test/main.c        |   6 ++++++
 7 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 homeworks/hw-4.org
 create mode 100644 src/matrix.c

diff --git a/homeworks/hw-4.org b/homeworks/hw-4.org
new file mode 100644
index 0000000..ba82878
--- /dev/null
+++ b/homeworks/hw-4.org
@@ -0,0 +1,10 @@
+* My Basic Routines
+* Linear Solution Routines
+** Gaussian Elimination with Backwards Substitution
+** LU factorization
+* Matrix Routines
+** dotproduct
+** crossproduct
+** matrixvector
+** matrixmatrix
+
diff --git a/inc/lizfcm.h b/inc/lizfcm.h
index b390394..2dc9e42 100644
--- a/inc/lizfcm.h
+++ b/inc/lizfcm.h
@@ -25,6 +25,9 @@ extern double linf_distance(Array_double *v1, Array_double *v2);
 
 extern void format_vector_into(Array_double *v, char *s);
 
+extern void format_matrix_into(Matrix_double *m, char *s);
+extern void put_identity_diagonal(Matrix_double *m);
+
 extern Line *least_squares_lin_reg(Array_double *x, Array_double *y);
 
 #endif // LIZFCM_H
diff --git a/inc/macros.h b/inc/macros.h
index 841084d..f6e531e 100644
--- a/inc/macros.h
+++ b/inc/macros.h
@@ -11,15 +11,20 @@
     size_t size;                                                               \
   } Array_##TYPE
 
+#define DEFINE_MATRIX(TYPE)                                                    \
+  typedef struct {                                                             \
+    Array_##TYPE **data;                                                       \
+    size_t cols;                                                               \
+    size_t rows;                                                               \
+  } Matrix_##TYPE
+
 #define InitArray(TYPE, ...)                                                   \
   ({                                                                           \
     TYPE temp[] = __VA_ARGS__;                                                 \
     Array_##TYPE *arr = malloc(sizeof(Array_##TYPE));                          \
     arr->size = sizeof(temp) / sizeof(temp[0]);                                \
     arr->data = malloc(arr->size * sizeof(TYPE));                              \
-    if (arr->data) {                                                           \
-      memcpy(arr->data, temp, arr->size * sizeof(TYPE));                       \
-    }                                                                          \
+    memcpy(arr->data, temp, arr->size * sizeof(TYPE));                         \
     arr;                                                                       \
   })
 
@@ -28,13 +33,22 @@
     Array_##TYPE *arr = malloc(sizeof(Array_##TYPE));                          \
     arr->size = SIZE;                                                          \
     arr->data = malloc(arr->size * sizeof(TYPE));                              \
-    if (arr->data) {                                                           \
-      for (size_t i = 0; i < arr->size; i++)                                   \
-        arr->data[i] = INIT_VALUE;                                             \
-    }                                                                          \
+    for (size_t i = 0; i < arr->size; i++)                                     \
+      arr->data[i] = INIT_VALUE;                                               \
     arr;                                                                       \
   })
 
+#define InitMatrixWithSize(TYPE, ROWS, COLS, INIT_VALUE)                       \
+  ({                                                                           \
+    Matrix_##TYPE *matrix = malloc(sizeof(Matrix_##TYPE));                     \
+    matrix->rows = ROWS;                                                       \
+    matrix->cols = COLS;                                                       \
+    matrix->data = malloc(matrix->rows * sizeof(Array_##TYPE *));              \
+    for (size_t y = 0; y < matrix->rows; y++)                                  \
+      matrix->data[y] = InitArrayWithSize(TYPE, COLS, INIT_VALUE);             \
+    matrix;                                                                    \
+  })
+
 #define c_max(x, y) (((x) >= (y)) ? (x) : (y))
 #define c_min(x, y) (((x) <= (y)) ? (x) : (y))
 
diff --git a/inc/types.h b/inc/types.h
index 4af17db..6df04c2 100644
--- a/inc/types.h
+++ b/inc/types.h
@@ -10,6 +10,12 @@ DEFINE_ARRAY(int32_t);
 DEFINE_ARRAY(float);
 DEFINE_ARRAY(double);
 
+DEFINE_MATRIX(int);
+DEFINE_MATRIX(uint32_t);
+DEFINE_MATRIX(int32_t);
+DEFINE_MATRIX(float);
+DEFINE_MATRIX(double);
+
 typedef struct Line {
   double m;
   double a;
diff --git a/lib/lizfcm.a b/lib/lizfcm.a
index fe9a6ca0f0f94baa4855185533df4a85a3fcd19e..7a21e875b0aa821425c37f48edfa9bfdb51bf990 100644
GIT binary patch
delta 2424
zcmaKue`r%z6vxj?8k^RbCbhLmTa!nzql#(MHQLI2HKL5d9&8L{-JHILYBgA!&_=f6
zMuhrD=h$exviZlrAN!{r{xK-X*kp9BjBXRG;G~R=wfIl!l<9xTXxDwud-sjb=`OkX
z-0!*P-FxnR=iX%IrNZlD8$;V-JK8%`bz8JmRn_OC_)=S=(e1IAs>Zf=<X+gAy+lNZ
zP~$#)p#&VLk}rbeWkg3n?tci*G!peo-2$@zX{kSu{7CXs$-CgFN_17~uOz#Pn#jG5
z=sRgp6l;Q)p?Tt4(jHLgTv<@Km7lg4eW}3{iHw0dn0(tv4rEefq)%py<l!R&nPg_z
zIGjuzO${Xa#c#?67jHn@<e$p>rLuXp?0{1??|a&uVbkFmJJcHO5IcSQ{85C$r3q{0
z5*3$yyZmQLEyY&u=oXKC?fy||bz7bEx!B>~<sXyQxU_yD-t+GY&Pr<!md&Mrd7R*s
zSn#)(2e2{qP;=hNhRP2eVx~%;3{;<2xFG`7`zMn%S!YQa&x+lZRf<n2bz#qGejdd(
zdmfcohIxSfJhLv#&?OB@KqTtIN{{(HF21P?XL}G=kSOvdSWcvOThvI}m(~y=RJ~wP
zn+4hbCWv+GGZwY;U@h#UU^Vy-xB=9qJr4SzW71w?*|U)XVqA}o2cY=?h@^~kf%xcq
zEowVKtWWQ-sKr3Us7Ebo9(2~>xjc4-`3uP7%z<#x?^x7sf;`TQ$+e_Sqk&-bDY008
zD{H^gdhE3quiDlP*g`Kn?YFy6>I;a0%R2T)|7EH7z{dKT)SM%%uS@-x)HkI5!_ry$
zRvPA|!}n4bq_zWCWQ~Q`iM12D0zueWfu^bLq&Oh;IM&MLM^yF?NS!maxE88(%(}!6
zp%Bt!G1Q{?CWGNKiabVF)aP6xT~^)lKS!yxy~DhGRJEtvI=Rg$aZ}w}ndXy&GRL8z
zq#fd{qqF*flx${?E-Y$;_|?%?Y4_|l-HE21;;g@OV^oe4mu5E}z|K+ubclDIZ4ozK
zINxz@tZg1#i~0&G7e3!yc@Va{#DcR$q#Y&Vk=Ns$FQsC>G+uO<#fyuj;_I5WES-K8
zqmT6x@fMv&lvOKEDl+p<_KFub!`rQt{hn{XSesX<-R$F06!gQ#J)A7qZSoC-Xn6CI
z{XAmLA!myZS5|74Pwk#q8KK;i)401b;<~+*s+!oee5!h4d5<fH3>xD>xQ>s63iEYT
zT&SVqd`-M4(!r|wd>uN?Na%6C^kQw3jKp-f6b!z$UPiqhQNee0)J;wqHIKnj!-o*{
z!ad3@R8Wyup09|TlikOJi%!aIQK;DDqT;#QU>5G?LNLWWEM#KjP+@hv=H}E~tUX57
zG(6n$sr?g6seM?m%UtkNFLsg{)JrEKor9^jhEz>c(d<q258=n^L^?A}jYDb)YPq<&
zW@{FU=2wqY_;=y#!X+D-0=@WIyKeE|CC~%=Cm`Pf7c6QSumbj|?B5FVHNxYA8cF*S
zrom)7A5So=&7r{)+_8AD8$_N(_`*OQ>70k4)&(L5^}QCgIEXQIKF6S@S~O25^qQZc
zy=d6wC~FL09}@2JI<gp49*^77VXf3Rqz*|vDRo%t&!ldYnlFge6I^GF$nE2Y_iJ7t
z(;ydKScSeS!YB-@B#l0yJD<=WKcVZz?TSF<fByrBFT<O%hB1^$^d2{Qj~zGq63PB&
z{4t<@!!Y_z4)hvE^V1Uy{X^+N{I}@iv54hA10Ow^7(9$2nujuj%`v;tM*SJ_hT8Bq
D^e4vG

delta 1133
zcma)*J!lhQ7{{MW()3#Uk!w@aG+##)snF89cs4EeXhCrCzziMKg1877GPKaaK}dxT
zf*+*3MLGzAu5J+*9a;w|Dzt+L1&0g{$zoIJ5Gxe_@4e5Bf-kxE_x}ISbMMzZ>D=1A
zUdv=1t6<NX=4Hz^O|xL3Gi}S7b{x}m?83&COtnTtckt*jbZ8BYXq0&kT<#&d2g-Pb
zImPic)=!zwnXj4O!AB<18`kfcH^KcrqEAE#f8rZ3<U)I#(58*k!wkeZd#W%acg@Y7
zo-JDPP)@xNdfeTmh97&D!aU6PUkc}Z_g|-;cEoCI(I{g%*~UYPWpNOjH$HSLC0!Y)
ziHk<j*k)H(L28N>W8T<hcY)ou*fHjlIw#%5J<4YF5{1EzNDdWyOZ`M?sMuir_RzD?
zXmfbsx30;Dj+%*=W4j?L;>EaV#=VFf)SZz{?LX4uiErV^6TBf-@^NiKXsKM^3%M>@
zVE2r7DWf5dq6tkG4^ug<<o8>C-w->gTy+cQN)k<Og4n!QQ*>w8cR*a8XDPZm`w<X_
z_ejzG8YLRTJlo(1_!c}1uCsq1G@vW&&ndq;X<;yoz<Ca=W7{an$u$r^?}4Jb3Pzxp
z72OJmwY{>UJC0xq??sp$+=ra!7(|NKR&<-7oad*{Gvqcfz}nsq(Ms=CgRh^)?GB(Q
z0-eWY4j?nAgGJW+*n@2SG9U2+)>q+4{fo6M6seC{pRzt-eW-Mm{;<*D1dU6q!#dbN
zOKKb>D8V`CL2M$Z0}Oo~l))0~2F@zm7d$e*#CpTm;$3zqq({Z)Y*yP6t?ZOGQBUU9
MHU7iBGB0%f1^<Sii2wiq

diff --git a/src/matrix.c b/src/matrix.c
new file mode 100644
index 0000000..115e0a3
--- /dev/null
+++ b/src/matrix.c
@@ -0,0 +1,22 @@
+#include "lizfcm.h"
+#include <assert.h>
+#include <stdio.h>
+
+void put_identity_diagonal(Matrix_double *m) {
+  assert(m->rows == m->cols);
+
+  for (size_t y = 0; y < m->rows; ++y)
+    m->data[y]->data[y] = 1.0;
+}
+
+void format_matrix_into(Matrix_double *m, char *s) {
+  sprintf(s, "");
+  if (m->rows == 0)
+    sprintf(s, "empty");
+
+  for (size_t y = 0; y < m->rows; ++y) {
+    char row_s[256];
+    format_vector_into(m->data[y], row_s);
+    sprintf(s, "%s %s \n", s, row_s);
+  }
+}
diff --git a/test/main.c b/test/main.c
index b0faf97..798bfbf 100644
--- a/test/main.c
+++ b/test/main.c
@@ -50,5 +50,11 @@ int main() {
   line = least_squares_lin_reg(v, w);
   printf("least_squares_lin_reg(v, w): (%f)x + %f\n", line->m, line->a);
 
+  char m_s[256];
+  Matrix_double *m = InitMatrixWithSize(double, 8, 8, 0.0);
+  put_identity_diagonal(m);
+  format_matrix_into(m, m_s);
+  printf("%s", m_s);
+
   return 0;
 }