X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9d2742e99a57ea99619973ec5b803fae8292095..1f606358fff6ef994cd58570e7c77ee6259d6a4e:/include/xbt/matrix.h

diff --git a/include/xbt/matrix.h b/include/xbt/matrix.h
index d5b67a6eb6..ac5a628fc2 100644
--- a/include/xbt/matrix.h
+++ b/include/xbt/matrix.h
@@ -1,8 +1,7 @@
-/* $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. */
@@ -20,7 +19,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;
 
 
@@ -31,18 +30,25 @@ 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, 
-			    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(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);
 
-void xbt_matrix_dump(xbt_matrix_t matrix, const char *name,
-		     void_f_pvoid_t display_fun);
+XBT_PUBLIC(void) xbt_matrix_free(xbt_matrix_t matrix);
+XBT_PUBLIC(void) xbt_matrix_free_voidp(void *d);
 
-SG_END_DECL()
+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);
 
-#endif /* XBT_MATRIX_H */
+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 */