X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9d2742e99a57ea99619973ec5b803fae8292095..270e80029037e77694ef6514c2028334c2a43afc:/include/xbt/matrix.h diff --git a/include/xbt/matrix.h b/include/xbt/matrix.h index d5b67a6eb6..d750c1e0e0 100644 --- a/include/xbt/matrix.h +++ b/include/xbt/matrix.h @@ -31,17 +31,37 @@ typedef struct { /** @brief Quick retrieval of scalar content * @hideinitializer */ -#define xbt_matrix_get_as(mat,l,c,type) *(type*)xbt_matrix_getp(mat,l,c) +#define xbt_matrix_get_as(mat,l,c,type) *(type*)xbt_matrix_get_ptr(mat,l,c) -xbt_matrix_t xbt_matrix_new(int lines, int rows, +XBT_PUBLIC(xbt_matrix_t) xbt_matrix_new(int lines, int rows, const unsigned long elmsize, void_f_pvoid_t * const free_f); -void xbt_matrix_free(xbt_matrix_t matrix); -void xbt_matrix_free_voidp(void *d); +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); -void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, +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, + int lsize, int rsize, + int lpos_dst,int rpos_dst, + int lpos_src,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_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_rand(int lines, int rows); +XBT_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_seq(int lines, int rows); +XBT_PUBLIC(xbt_matrix_t) xbt_matrix_double_new_mult(xbt_matrix_t A,xbt_matrix_t B); +XBT_PUBLIC(void) xbt_matrix_double_addmult(xbt_matrix_t A,xbt_matrix_t B, + /*OUT*/ xbt_matrix_t C); SG_END_DECL()