-/* $Id$ */
-
/* xbt_matrix_t management functions */
-/* Copyright (c) 2006 Martin Quinson. All rights reserved. */
+/* 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. */
unsigned long elmsize;
char *data;
- void_f_pvoid_t *free_f;
+ void_f_pvoid_t free_f;
} s_xbt_matrix_t, *xbt_matrix_t;
/** @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_matrix_t xbt_matrix_new(int lines, int rows,
- const unsigned long elmsize,
- void_f_pvoid_t * const free_f);
+#define xbt_matrix_get_as(mat,l,c,type) *(type*)xbt_matrix_get_ptr(mat,l,c)
-void xbt_matrix_free(xbt_matrix_t matrix);
-void xbt_matrix_free_voidp(void *d);
+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);
-void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords,
- void_f_pvoid_t display_fun);
-void xbt_matrix_dump_display_double(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_matrix_t xbt_matrix_double_new_zeros(int lines, int rows);
-xbt_matrix_t xbt_matrix_double_new_id(int lines, int rows);
-xbt_matrix_t xbt_matrix_double_new_rand(int lines, int rows);
-xbt_matrix_t xbt_matrix_double_new_mult(xbt_matrix_t A,xbt_matrix_t B);
+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 */
+#endif /* XBT_MATRIX_H */