A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : remove useless debug message and add another one
[simgrid.git]
/
src
/
xbt
/
xbt_matrix.c
diff --git
a/src/xbt/xbt_matrix.c
b/src/xbt/xbt_matrix.c
index
0a07b4e
..
333d5cd
100644
(file)
--- a/
src/xbt/xbt_matrix.c
+++ b/
src/xbt/xbt_matrix.c
@@
-1,6
+1,6
@@
/* xbt_matrix_t management functions */
/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-47,7
+47,7
@@
void xbt_matrix_free(xbt_matrix_t mat)
if (mat) {
if (mat->free_f) {
for (i = 0; i < (mat->lines * mat->rows); i++) {
if (mat) {
if (mat->free_f) {
for (i = 0; i < (mat->lines * mat->rows); i++) {
-
(*(mat->free_f))
((void *) &(mat->data[i * mat->elmsize]));
+
mat->free_f
((void *) &(mat->data[i * mat->elmsize]));
}
}
free(mat->data);
}
}
free(mat->data);
@@
-69,16
+69,16
@@
void xbt_matrix_dump(xbt_matrix_t matrix, const char *name, int coords,
{
unsigned int i, j;
{
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)
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, " ");
else
fprintf(stderr, " ");
-
(*display_fun)
(xbt_matrix_get_ptr(matrix, i, j));
+
display_fun
(xbt_matrix_get_ptr(matrix, i, j));
}
fprintf(stderr, "\n");
}
}
fprintf(stderr, "\n");
}
@@
-109,7
+109,7
@@
void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
unsigned int i, j;
XBT_DEBUG
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);
lsize, rsize, lpos_src, rpos_src, src->lines, src->rows, lpos_dst,
rpos_dst, dst->lines, dst->rows);
@@
-128,7
+128,7
@@
void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
if (cpy_f) {
for (j = 0; j < lsize; j++)
xbt_matrix_get_as(dst, j + lpos_dst, i + rpos_dst, void *) =
if (cpy_f) {
for (j = 0; j < lsize; j++)
xbt_matrix_get_as(dst, j + lpos_dst, i + rpos_dst, void *) =
-
(*cpy_f)
(xbt_matrix_get_ptr(src, j + rpos_src, i + lpos_src));
+
cpy_f
(xbt_matrix_get_ptr(src, j + rpos_src, i + lpos_src));
} else {
memcpy(xbt_matrix_get_ptr(dst, lpos_dst, i + rpos_dst),
xbt_matrix_get_ptr(src, lpos_src, i + rpos_src),
} else {
memcpy(xbt_matrix_get_ptr(dst, lpos_dst, i + rpos_dst),
xbt_matrix_get_ptr(src, lpos_src, i + rpos_src),
@@
-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);
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;
}
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);
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;
}
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);
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;
}
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);
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,7
+182,7
@@
xbt_matrix_t xbt_matrix_double_new_seq(int lines, int rows)
return res;
}
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;
int xbt_matrix_double_is_seq(xbt_matrix_t mat)
{
int i;
@@
-211,8
+211,8
@@
void xbt_matrix_double_addmult(xbt_matrix_t A, xbt_matrix_t B,
{
unsigned int i, j, k;
{
unsigned int i, j, k;
- xbt_assert
2
(A->lines == C->lines,
- "A->lines != C->lines (%
d vs %d
)", A->lines, C->lines);
+ xbt_assert(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++)
xbt_assert(B->rows == C->rows);
for (i = 0; i < C->lines; i++)