X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..c9da3f822dd0c5ff8590c5f81ee60e24c85cfc77:/src/xbt/xbt_matrix.c diff --git a/src/xbt/xbt_matrix.c b/src/xbt/xbt_matrix.c index d5f041764e..9cb965c70d 100644 --- a/src/xbt/xbt_matrix.c +++ b/src/xbt/xbt_matrix.c @@ -1,6 +1,6 @@ /* xbt_matrix_t management functions */ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -69,13 +69,13 @@ void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords, { unsigned int i, j; - fprintf(stderr, ">>> Matrix %s dump (%d x %d)\n", name, matrix->lines, + fprintf(stderr, ">>> Matrix %s dump (%u x %u)\n", name, matrix->lines, matrix->rows); for (i = 0; i < matrix->lines; i++) { fprintf(stderr, " "); for (j = 0; j < matrix->rows; j++) { if (coords) - fprintf(stderr, " (%d,%d)=", i, j); + fprintf(stderr, " (%u,%u)=", i, j); else fprintf(stderr, " "); display_fun(xbt_matrix_get_ptr(matrix, i, j)); @@ -109,7 +109,7 @@ void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src, unsigned int i, j; XBT_DEBUG - ("Copy a %dx%d submatrix from %dx%d(of %dx%d) to %dx%d (of %dx%d)", + ("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); @@ -138,7 +138,7 @@ void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src, } -/** \brief Creates a new matrix of double filled with zeros */ +/** \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); @@ -147,7 +147,7 @@ xbt_matrix_t xbt_matrix_double_new_zeros(int lines, int rows) return res; } -/** \brief Creates a new matrix of double being the identity matrix */ +/** \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); @@ -158,7 +158,7 @@ xbt_matrix_t xbt_matrix_double_new_id(int lines, int rows) return res; } -/** \brief Creates a new matrix of double randomly filled */ +/** \brief Creates a new matrix of double randomly filled */ xbt_matrix_t xbt_matrix_double_new_rand(int lines, int rows) { xbt_matrix_t res = xbt_matrix_new(lines, rows, sizeof(double), NULL); @@ -170,7 +170,7 @@ xbt_matrix_t xbt_matrix_double_new_rand(int lines, int rows) return res; } -/** \brief Creates a new matrix of double containing the sequence of numbers in order */ +/** \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); @@ -182,10 +182,10 @@ xbt_matrix_t xbt_matrix_double_new_seq(int lines, int rows) return res; } -/** \brief Checks whether the matrix contains the sequence of numbers */ +/** \brief Checks whether the matrix contains the sequence of numbers */ int xbt_matrix_double_is_seq(xbt_matrix_t mat) { - int i; + unsigned int i; for (i = 0; i < mat->lines * mat->rows; i++) { double val = xbt_matrix_get_as(mat, i, 0, double); @@ -212,7 +212,7 @@ void xbt_matrix_double_addmult(xbt_matrix_t A, xbt_matrix_t B, unsigned int i, j, k; xbt_assert(A->lines == C->lines, - "A->lines != C->lines (%d vs %d)", A->lines, C->lines); + "A->lines != C->lines (%u vs %u)", A->lines, C->lines); xbt_assert(B->rows == C->rows); for (i = 0; i < C->lines; i++)