cozis/Lina
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed curly bracket code style

Browse Source
This commit is contained in:
Francesco Cozzuto
2023-03-30 01:25:07 +02:00
parent 4d35b7d8de
commit 85f5fc43d7
2 changed files with 275 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -4
View File
@@ -1,4 +1,2 @@
# Lina # Lina, the nice-to-read linear algebra toolkit!
Lina (***Lin**ear **A**lgebra*) is a C library that implements common linear algebra operations. Lina (***Lin**ear **A**lgebra*) is a C library that implements common linear algebra operations with the aim to be nice to read!
Note that this is still a work in progress.
src/lina.c
+46 -86
View File
@@ -29,34 +29,26 @@
** - This function can never fail. ** - This function can never fail.
*/ */
void lina_dot(double *A, double *B, double *C, int m, int n, int l) void lina_dot(double *A, double *B, double *C, int m, int n, int l)
{
lina_dot2(A, B, C, 0, 0, 0, m, n, l);
}
void lina_dot2(double *A, double *B, double *C,
int As, int Bs, int Cs,
int m, int n, int l)
{ {
assert(m > 0 && n > 0 && l > 0); assert(m > 0 && n > 0 && l > 0);
assert(As >= 0 && Bs >= 0 && Cs >= 0);
assert(A != NULL && B != NULL && C != NULL); assert(A != NULL && B != NULL && C != NULL);
assert(A != C && B != C); assert(A != C && B != C);
// Iteration over A's rows // Iteration over A's rows
for(int i = 0; i < m; i++) for(int i = 0; i < m; i++) {
{
// Iteration over B's columns // Iteration over B's columns
for(int k = 0; k < l; k++) for(int k = 0; k < l; k++) {
{
double pos = 0; double sum = 0;
// Iteration over the single B column // Iteration over the single B column
// for executing the product of sum // for executing the product of sum
for(int j=0; j < n; j++) for(int j=0; j < n; j++)
pos += A[i*(n + As) + j] * B[j*(l + Bs) + k]; sum += A[i * n + j] * B[j * l + k];
C[i*(l + Cs) + k] = pos; C[i * l + k] = sum;
} }
} }
} }
@@ -130,8 +122,7 @@ void lina_transpose(double *A, double *B, int m, int n)
assert(m > 0 && n > 0); assert(m > 0 && n > 0);
assert(A != NULL && B != NULL); assert(A != NULL && B != NULL);
if(m == 1 || n == 1) if(m == 1 || n == 1) {
{
// For a matrix with height or width of 1 // For a matrix with height or width of 1
// row-major and column-major order coincide, // row-major and column-major order coincide,
// so the stransposition doesn't change the // so the stransposition doesn't change the
@@ -140,9 +131,9 @@ void lina_transpose(double *A, double *B, int m, int n)
if(A != B) // Does the copy or the branch cost more? if(A != B) // Does the copy or the branch cost more?
memcpy(B, A, sizeof(A[0]) * m * n); memcpy(B, A, sizeof(A[0]) * m * n);
}
else if(m == n) } else if(m == n) {
{
// Iterate over the upper triangular portion of // Iterate over the upper triangular portion of
// the matrix and switch each element with the // the matrix and switch each element with the
// corresponding one in the lower triangular portion. // corresponding one in the lower triangular portion.
@@ -153,15 +144,13 @@ void lina_transpose(double *A, double *B, int m, int n)
// is avoided. // is avoided.
for(int i = 0; i < n; i += 1) for(int i = 0; i < n; i += 1)
for(int j = 0; j < i+1; j += 1) for(int j = 0; j < i+1; j += 1) {
{
double temp = A[i*n + j]; double temp = A[i*n + j];
B[i*n + j] = A[j*n + i]; B[i*n + j] = A[j*n + i];
B[j*n + i] = temp; B[j*n + i] = temp;
} }
}
else } else {
{
// Not only the matrix needs to be transposed // Not only the matrix needs to be transposed
// assuming the destination matrix is the same // assuming the destination matrix is the same
// as the source matrix, but the memory representation // as the source matrix, but the memory representation
@@ -182,8 +171,7 @@ void lina_transpose(double *A, double *B, int m, int n)
double item = A[1]; double item = A[1];
int next = m; int next = m;
while(next != 1) while(next != 1) {
{
double temp = A[next]; double temp = A[next];
B[next] = item; B[next] = item;
item = temp; item = temp;
@@ -241,12 +229,9 @@ static int scanValue(FILE *fp, char *buffer, int max_length, char first, char *f
// Scan the integer portion of // Scan the integer portion of
// the numeric value and copy it // the numeric value and copy it
// into the buffer. // into the buffer.
do do {
{
if(n == max_length) if(n == max_length) {
{
// ERROR: Internal buffer is too small to hold
// the representation of this item.
*error = "Internal buffer is too small to hold " *error = "Internal buffer is too small to hold "
"the representation of a numeric value"; "the representation of a numeric value";
return 0; return 0;
@@ -255,8 +240,8 @@ static int scanValue(FILE *fp, char *buffer, int max_length, char first, char *f
buffer[n++] = c; buffer[n++] = c;
c = getc(fp); c = getc(fp);
}
while(c != EOF && isdigit(c)); } while(c != EOF && isdigit(c));
// Did the integer part end with // Did the integer part end with
// a dot? // a dot?
@@ -265,10 +250,8 @@ static int scanValue(FILE *fp, char *buffer, int max_length, char first, char *f
// Now scan and copy the decimal // Now scan and copy the decimal
// part of the numeric value if // part of the numeric value if
// a dot was found. // a dot was found.
if(dot) if(dot) {
{ if(n == max_length) {
if(n == max_length)
{
// ERROR: Internal buffer is too small to hold // ERROR: Internal buffer is too small to hold
// the representation of this item. // the representation of this item.
// (The dot doesn't fit.) // (The dot doesn't fit.)
@@ -281,18 +264,15 @@ static int scanValue(FILE *fp, char *buffer, int max_length, char first, char *f
c = getc(fp); c = getc(fp);
if(!isdigit(c)) if(!isdigit(c)) {
{
// ERROR: Got something other than a // ERROR: Got something other than a
// digit after the dot. // digit after the dot.
*error = "Got something other than a digit after the dot."; *error = "Got something other than a digit after the dot.";
return 0; return 0;
} }
do do {
{ if(n == max_length) {
if(n == max_length)
{
// ERROR: Internal buffer is too small // ERROR: Internal buffer is too small
// to hold the representation of // to hold the representation of
// this item. // this item.
@@ -304,8 +284,7 @@ static int scanValue(FILE *fp, char *buffer, int max_length, char first, char *f
buffer[n++] = c; buffer[n++] = c;
c = getc(fp); c = getc(fp);
} } while(c != EOF && isdigit(c));
while(c != EOF && isdigit(c));
} }
buffer[n] = '\0'; buffer[n] = '\0';
@@ -377,16 +356,14 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
while(c != EOF && isspace(c)) while(c != EOF && isspace(c))
c = getc(fp); c = getc(fp);
if(c == EOF) if(c == EOF) {
{
// ERROR: Stream ended before a matrix was // ERROR: Stream ended before a matrix was
// found. // found.
*error = "Stream ended before a matrix was found"; *error = "Stream ended before a matrix was found";
return NULL; return NULL;
} }
if(c != '[') if(c != '[') {
{
// ERROR: Was expected a '[' as the first // ERROR: Was expected a '[' as the first
// character of a matrix, but got // character of a matrix, but got
// something else instead. // something else instead.
@@ -401,8 +378,7 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
while(c != EOF && isspace(c)) while(c != EOF && isspace(c))
c = getc(fp); c = getc(fp);
if(c == EOF) if(c == EOF) {
{
// ERROR: Stream ended where a numeric value // ERROR: Stream ended where a numeric value
// was expected. // was expected.
*error = "Stream ended where a numeric value " *error = "Stream ended where a numeric value "
@@ -412,8 +388,7 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
double *matrix = malloc(sizeof(matrix[0]) * 64); double *matrix = malloc(sizeof(matrix[0]) * 64);
if(matrix == NULL) if(matrix == NULL) {
{
// ERROR: Insufficient memory. // ERROR: Insufficient memory.
*error = "Insufficient memory"; *error = "Insufficient memory";
return NULL; return NULL;
@@ -423,10 +398,8 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
w = -1, i = 0, j = 0; w = -1, i = 0, j = 0;
if(c != ']') if(c != ']')
while(1) while(1) {
{ if(!isdigit(c)) {
if(!isdigit(c))
{
// ERROR: Got something other than a digit // ERROR: Got something other than a digit
// where a numeric value was expected. // where a numeric value was expected.
*error = "Got something other than a numeric " *error = "Got something other than a numeric "
@@ -451,14 +424,12 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
assert(res == 1 || res == -1); assert(res == 1 || res == -1);
// Make sure the matrix has enough space. // Make sure the matrix has enough space.
if(size == capacity) if(size == capacity) {
{
int new_capacity = capacity * 2; int new_capacity = capacity * 2;
double *temp = realloc(matrix, sizeof(double) * new_capacity); double *temp = realloc(matrix, sizeof(double) * new_capacity);
if(temp == NULL) if(temp == NULL) {
{
// ERROR: Insufficient memory. // ERROR: Insufficient memory.
*error = "Insufficient memory"; *error = "Insufficient memory";
free(matrix); free(matrix);
@@ -478,8 +449,7 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
else else
casted = strtod(buffer, NULL); casted = strtod(buffer, NULL);
if(errno) if(errno) {
{
// ERROR: Failed to convert a numeric value // ERROR: Failed to convert a numeric value
// from it's string form to a numeric // from it's string form to a numeric
// variable. // variable.
@@ -495,23 +465,20 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
while(c != EOF && isspace(c)) while(c != EOF && isspace(c))
c = getc(fp); c = getc(fp);
if(c == ']' || c == ',') if(c == ']' || c == ',') {
{
// The matrix's row just ended. // The matrix's row just ended.
if(w == -1) if(w == -1)
// This was the first row. // This was the first row.
w = i; w = i;
else else {
{
// This wasn't the first row, // This wasn't the first row,
// so it's possible that it's // so it's possible that it's
// length is different from the // length is different from the
// previous ones. // previous ones.
assert(w > -1); assert(w > -1);
if(i != w) if(i != w) {
{
// ERROR: The j-th row has the wrong // ERROR: The j-th row has the wrong
// number of elements. // number of elements.
if(i < w) if(i < w)
@@ -535,8 +502,7 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
c = getc(fp); c = getc(fp);
} }
if(c == EOF) if(c == EOF) {
{
// ERROR: Stream ended inside a matrix, where // ERROR: Stream ended inside a matrix, where
// either ',', ']' or a numeric value was // either ',', ']' or a numeric value was
// expected. // expected.
@@ -546,8 +512,7 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
} }
} }
if(size == 0) if(size == 0) {
{
free(matrix); free(matrix);
*error = "Empty matrix"; *error = "Empty matrix";
return NULL; return NULL;
@@ -559,8 +524,8 @@ double *lina_loadMatrixFromStream(FILE *fp, int *width, int *height, char **erro
// build the matrix. // build the matrix.
int fragm_threshold = 30; // (It's a percentage) int fragm_threshold = 30; // (It's a percentage)
if(100.0 * size/capacity < fragm_threshold) if(100.0 * size/capacity < fragm_threshold) {
{
int new_capacity = (size == 0) ? 1 : size; int new_capacity = (size == 0) ? 1 : size;
double *temp = realloc(matrix, new_capacity * sizeof(double)); double *temp = realloc(matrix, new_capacity * sizeof(double));
@@ -613,14 +578,12 @@ int lina_saveMatrixToStream(FILE *fp, double *A, int width, int height, char **e
else else
*error = NULL; *error = NULL;
if (width < 1) if (width < 1) {
{
*error = "The provided width is less than one"; *error = "The provided width is less than one";
return -1; return -1;
} }
if (height < 1) if (height < 1) {
{
*error = "The provided height is less than one"; *error = "The provided height is less than one";
return -1; return -1;
} }
@@ -630,13 +593,11 @@ int lina_saveMatrixToStream(FILE *fp, double *A, int width, int height, char **e
putc('[',fp); putc('[',fp);
for (int i = 0; i < height-1; i++) for (int i = 0; i < height-1; i++) {
{
for (int j = 0; j < width-1; j++) for (int j = 0; j < width-1; j++)
fprintf(fp, "%f ", A[i*width + j]); fprintf(fp, "%f ", A[i*width + j]);
fprintf(fp, "%f, ", A[i*width + width-1]); fprintf(fp, "%f, ", A[i*width + width-1]);
} }
for (int j = 0; j < width-1; j++) for (int j = 0; j < width-1; j++)
@@ -666,8 +627,7 @@ void lina_conv(double *A, double *B, double *C,
// Iterate over each pixel of the result matrix.. // Iterate over each pixel of the result matrix..
for(int j = 0; j < Ch; j += 1) for(int j = 0; j < Ch; j += 1)
for(int i = 0; i < Cw; i += 1) for(int i = 0; i < Cw; i += 1) {
{
// ..and calculate it's value as // ..and calculate it's value as
// the scalar product between the // the scalar product between the
// mask B and a portion of A. // mask B and a portion of A.