X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f8e11bd3c39828b5ee887efa53102bda85b50c4..66d97e68ea51b5514594e5818f75c7d844586eae:/include/xbt/matrix.h

diff --git a/include/xbt/matrix.h b/include/xbt/matrix.h
index 1ffab4b8c6..a224fa13e1 100644
--- a/include/xbt/matrix.h
+++ b/include/xbt/matrix.h
@@ -20,7 +20,7 @@ typedef struct {
   unsigned long elmsize;
 
   char *data;
-  void_f_pvoid_t *free_f;
+  void_f_pvoid_t free_f;
 } s_xbt_matrix_t, *xbt_matrix_t;
 
 
@@ -33,22 +33,35 @@ typedef struct {
    *  @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, 
+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);
-
-void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords,
+			    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);
-void xbt_matrix_dump_display_double(void*d);
+XBT_PUBLIC(void) xbt_matrix_dump_display_double(void*d);
 
 
-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_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()