+++ /dev/null
-/* xbt_matrix_t management functions */
-
-/* Copyright (c) 2006-2007, 2009-2010, 2013-2014. The SimGrid Team.
- * All rights reserved. */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifndef XBT_MATRIX_H
-#define XBT_MATRIX_H
-
-#include "xbt/misc.h"
-#include "xbt/function_types.h"
-
-SG_BEGIN_DECL()
-
-typedef struct {
- unsigned int lines;
- unsigned int rows;
- unsigned long elmsize;
-
- char *data;
- void_f_pvoid_t free_f;
-} s_xbt_matrix_t;
-typedef s_xbt_matrix_t* xbt_matrix_t;
-
- /** @brief Retrieve the address of a cell (not its content)
- * @hideinitializer */
-#define xbt_matrix_get_ptr(mat,l,c) \
- ((void*)&(mat)->data[(c)*(mat)->lines*(mat)->elmsize + (l)*(mat)->elmsize])
-
- /** @brief Quick retrieval of scalar content
- * @hideinitializer */
-#define xbt_matrix_get_as(mat,l,c,type) *(type*)xbt_matrix_get_ptr(mat,l,c)
-
-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_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(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_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_seq(int lines, int rows);
-XBT_PUBLIC(void) xbt_matrix_double_addmult(xbt_matrix_t A, xbt_matrix_t B, /*OUT*/ xbt_matrix_t C);
-SG_END_DECL()
-#endif /* XBT_MATRIX_H */
+++ /dev/null
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include <stdio.h>
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/matrix.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_matrix, xbt, "2D data storage");
-
-/** @brief constructor */
-xbt_matrix_t xbt_matrix_new(int lines, int rows, const unsigned long elmsize, void_f_pvoid_t const free_f)
-{
- xbt_matrix_t res = xbt_new(s_xbt_matrix_t, 1);
- res->lines = lines;
- res->rows = rows;
- res->elmsize = elmsize;
- res->free_f = free_f;
- res->data = xbt_malloc(elmsize * lines * rows);
- return res;
-}
-
-/** @brief Creates a matrix being a submatrix of another one */
-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_matrix_t res = xbt_matrix_new(lsize, rsize, from->elmsize, from->free_f);
- xbt_matrix_copy_values(res, from, lsize, rsize, 0, 0, lpos, rpos, cpy_f);
- return res;
-}
-
-/** @brief destructor */
-void xbt_matrix_free(xbt_matrix_t mat)
-{
- if (mat) {
- if (mat->free_f) {
- for (unsigned i = 0; i < (mat->lines * mat->rows); i++) {
- mat->free_f((void *) &(mat->data[i * mat->elmsize]));
- }
- }
- free(mat->data);
- free(mat);
- }
-}
-
-/** @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)
-{
- fprintf(stderr, ">>> Matrix %s dump (%u x %u)\n", name, matrix->lines, matrix->rows);
- for (unsigned i = 0; i < matrix->lines; i++) {
- fprintf(stderr, " ");
- for (unsigned j = 0; j < matrix->rows; j++) {
- if (coords)
- fprintf(stderr, " (%u,%u)=", i, j);
- else
- fprintf(stderr, " ");
- display_fun(xbt_matrix_get_ptr(matrix, i, j));
- }
- fprintf(stderr, "\n");
- }
- fprintf(stderr, "<<< end_of_matrix %s dump\n", name);
-}
-
-/** @brief Copy the values from the matrix src into the matrix dst
- * @param dst: destination
- * @param src: source
- * @param lsize: number of lines to copy
- * @param rsize: number of rows to copy
- * @param lpos_dst: line offset on destination matrix
- * @param rpos_dst: row offset on destination matrix
- * @param lpos_src: line offset on destination matrix
- * @param rpos_src: row offset on destination matrix
- * @param cpy_f: the function to use to copy the elements over
- */
-void xbt_matrix_copy_values(xbt_matrix_t dst, 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_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);
-
- /* everybody knows that issue is between the chair and the screen (particularly in my office) */
- xbt_assert(src->elmsize == dst->elmsize);
- /* don't check free_f since the user may play weird games with this */
-
- xbt_assert(lpos_src + lsize <= src->lines);
- xbt_assert(rpos_src + rsize <= src->rows);
-
- xbt_assert(lpos_dst + lsize <= dst->lines);
- xbt_assert(rpos_dst + rsize <= dst->rows);
-
- /* Lets get serious here */
- for (unsigned i = 0; i < rsize; i++) {
- if (cpy_f) {
- 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 {
- memcpy(xbt_matrix_get_ptr(dst, lpos_dst, i + rpos_dst), xbt_matrix_get_ptr(src, lpos_src, i + rpos_src),
- dst->elmsize * lsize);
- }
- }
-}
-
-/** @brief Creates a new matrix of double filled with zeros */
-xbt_matrix_t xbt_matrix_double_new_zeros(int lines, int rows)
-{
- xbt_matrix_t res = xbt_matrix_new(lines, rows, sizeof(double), NULL);
-
- memset(res->data, 0, res->elmsize * res->lines * res->rows);
- return res;
-}
-
-/** @brief Creates a new matrix of double being the identity matrix */
-xbt_matrix_t xbt_matrix_double_new_id(int lines, int rows)
-{
- xbt_matrix_t res = xbt_matrix_double_new_zeros(lines, rows);
-
- for (int i = 0; i < lines; i++)
- xbt_matrix_get_as(res, i, i, double) = 1;
- return res;
-}
-
-/** @brief Creates a new matrix of double containing the sequence of numbers in order */
-xbt_matrix_t xbt_matrix_double_new_seq(int lines, int rows)
-{
- xbt_matrix_t res = xbt_matrix_new(lines, rows, sizeof(double), NULL);
-
- 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)
-{
- xbt_assert(A->lines == C->lines, "A->lines != C->lines (%u vs %u)", A->lines, C->lines);
- xbt_assert(B->rows == C->rows);
-
- 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);
-}
