XBT_PUBLIC(xbt_matrix_t) xbt_matrix_new(int lines, int rows, const unsigned long elmsize, void_f_pvoid_t const free_f);
XBT_PUBLIC(xbt_matrix_t) xbt_matrix_new_sub(xbt_matrix_t from, int lsize, int rsize, int lpos, int rpos,
pvoid_f_pvoid_t const cpy_f);
-
XBT_PUBLIC(void) xbt_matrix_free(xbt_matrix_t matrix);
-XBT_PUBLIC(void) xbt_matrix_free_voidp(void *d);
XBT_PUBLIC(void) xbt_matrix_copy_values(xbt_matrix_t dest, xbt_matrix_t src, unsigned int lsize, unsigned int rsize,
unsigned int lpos_dst, unsigned int rpos_dst, unsigned int lpos_src,
unsigned int rpos_src, pvoid_f_pvoid_t const cpy_f);
XBT_PUBLIC(void) xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords, void_f_pvoid_t display_fun);
-XBT_PUBLIC(void) xbt_matrix_dump_display_double(void *d);
XBT_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_zeros(int lines, int rows);
XBT_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_id(int lines, int rows);
-/* xbt_matrix_t management functions */
-
/* Copyright (c) 2006-2014. The SimGrid Team.
* All rights reserved. */
/** \brief destructor */
void xbt_matrix_free(xbt_matrix_t mat)
{
- unsigned int i;
if (mat) {
if (mat->free_f) {
- for (i = 0; i < (mat->lines * mat->rows); i++) {
+ for (unsigned i = 0; i < (mat->lines * mat->rows); i++) {
mat->free_f((void *) &(mat->data[i * mat->elmsize]));
}
}
}
}
-/** \brief Freeing function for containers of xbt_matrix_t */
-void xbt_matrix_free_voidp(void *d)
-{
- xbt_matrix_free((xbt_matrix_t) * (void **) d);
-}
-
/** \brief Display the content of a matrix (debugging purpose)
* \param coords: boolean indicating whether we should add the coords of each cell to the output*/
void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords, void_f_pvoid_t display_fun)
{
- unsigned int i, j;
-
fprintf(stderr, ">>> Matrix %s dump (%u x %u)\n", name, matrix->lines, matrix->rows);
- for (i = 0; i < matrix->lines; i++) {
+ for (unsigned i = 0; i < matrix->lines; i++) {
fprintf(stderr, " ");
- for (j = 0; j < matrix->rows; j++) {
+ for (unsigned j = 0; j < matrix->rows; j++) {
if (coords)
fprintf(stderr, " (%u,%u)=", i, j);
else
fprintf(stderr, "<<< end_of_matrix %s dump\n", name);
}
-void xbt_matrix_dump_display_double(void *d)
-{
- fprintf(stderr, "%.2f", *(double *) d);
-}
-
/** \brief Copy the values from the matrix src into the matrix dst
* \param dest: destination
* \param src: source
unsigned int lpos_dst, unsigned int rpos_dst,unsigned int lpos_src, unsigned int rpos_src,
pvoid_f_pvoid_t const cpy_f)
{
- unsigned int i, j;
-
XBT_DEBUG ("Copy a %ux%u submatrix from %ux%u(of %ux%u) to %ux%u (of %ux%u)",
lsize, rsize, lpos_src, rpos_src, src->lines, src->rows, lpos_dst, rpos_dst, dst->lines, dst->rows);
xbt_assert(rpos_dst + rsize <= dst->rows);
/* Lets get serious here */
- for (i = 0; i < rsize; i++) {
+ for (unsigned i = 0; i < rsize; i++) {
if (cpy_f) {
- for (j = 0; j < lsize; j++)
+ for (unsigned j = 0; j < lsize; j++)
xbt_matrix_get_as(dst, j + lpos_dst, i + rpos_dst, void *) =
cpy_f(xbt_matrix_get_ptr(src, j + rpos_src, i + lpos_src));
} else {
xbt_matrix_t xbt_matrix_double_new_id(int lines, int rows)
{
xbt_matrix_t res = xbt_matrix_double_new_zeros(lines, rows);
- int i;
- for (i = 0; i < lines; i++)
+ for (int i = 0; i < lines; i++)
xbt_matrix_get_as(res, i, i, double) = 1;
return res;
}
xbt_matrix_t xbt_matrix_double_new_seq(int lines, int rows)
{
xbt_matrix_t res = xbt_matrix_new(lines, rows, sizeof(double), NULL);
- int i;
- for (i = 0; i < lines * rows; i++)
+ for (int i = 0; i < lines * rows; i++)
*(double *) &res->data[i * res->elmsize] = i;
return res;
/** \brief add to C the result of A*B */
void xbt_matrix_double_addmult(xbt_matrix_t A, xbt_matrix_t B, /*OUT*/ xbt_matrix_t C)
{
- unsigned int i, j, k;
-
xbt_assert(A->lines == C->lines, "A->lines != C->lines (%u vs %u)", A->lines, C->lines);
xbt_assert(B->rows == C->rows);
- for (i = 0; i < C->lines; i++)
- for (j = 0; j < C->rows; j++)
- for (k = 0; k < B->lines; k++)
+ for (unsigned i = 0; i < C->lines; i++)
+ for (unsigned j = 0; j < C->rows; j++)
+ for (unsigned k = 0; k < B->lines; k++)
xbt_matrix_get_as(C, i, j, double) += xbt_matrix_get_as(A, i, k, double) * xbt_matrix_get_as(B, k, j, double);
}