diff --git a/CUtils/CUtils.xs b/CUtils/CUtils.xs index cd7fb11ded20dd9326277ce6f636528b70faf210..c0f25ecb8c7f05d5e817db3376203b21a2467fd1 100644 --- a/CUtils/CUtils.xs +++ b/CUtils/CUtils.xs @@ -4,9 +4,9 @@ #include "ppport.h" -#include <fisher.h> -#include <chisq.h> -#include <double_permutation.h> +#include "fisher.h" +#include "chisq.h" +#include "double_permutation.h" #include "const-c.inc" diff --git a/CUtils/c_sources/double_permutation.c b/CUtils/c_sources/double_permutation.c index 66cec1b6228f86b0f264b63a7a698ff9560b7bc3..93cd300728e4def498a9b9f0a95fbc76548f6216 100644 --- a/CUtils/c_sources/double_permutation.c +++ b/CUtils/c_sources/double_permutation.c @@ -6,8 +6,8 @@ #include "double_permutation.h" #define CALC_PVAL(count, nb_sample) \ - ((datatype_t)(count-1))/* On s'enlève soi-même*/ \ - /nb_sample + (((datatype_t)(count-1))/* On s'enlève soi-même*/ \ + /(nb_sample)) int read_matrice(matrice_t mat, int nb_sample, int nb_chi2) diff --git a/CUtils/c_sources/double_permutation.h b/CUtils/c_sources/double_permutation.h index be62bd5f164cb061ccd50bea71fbd25290a45176..85c204779b693e111a3d97d057c522f7acd55b4a 100644 --- a/CUtils/c_sources/double_permutation.h +++ b/CUtils/c_sources/double_permutation.h @@ -1,7 +1,7 @@ #ifndef _DOUBLE_PERMUTATION_H #define _DOUBLE_PERMUTATION_H -#include <datatype.h> +#include "datatype.h" typedef datatype_t *ensemble_t; typedef ensemble_t *matrice_t; diff --git a/CUtils/c_sources/fisher.c b/CUtils/c_sources/fisher.c index 16945c81614843864ebba17d25875b0de0fca526..772c4e23fb4f0d89a2e2252be4d73429f187045b 100644 --- a/CUtils/c_sources/fisher.c +++ b/CUtils/c_sources/fisher.c @@ -1,5 +1,5 @@ -#include "./fisher.h" +#include "fisher.h" #include <math.h> typedef struct {