diff options
| author | Calvin Morrison <mutantturkey@gmail.com> | 2014-02-19 16:02:52 -0500 |
|---|---|---|
| committer | Calvin Morrison <mutantturkey@gmail.com> | 2014-02-19 16:02:52 -0500 |
| commit | ac86133781d7cd50964579f79522a4e3f8c3f339 (patch) | |
| tree | 2bd3d58125e48b9c4439b7f22eb22f0d7a5ffab1 /FEAST/MIToolbox/RenyiEntropy.c | |
| parent | 7889905d7478f31d8092187cd104beee39972ebb (diff) | |
add a safe alloc function so our program doesn't segfault on memory shortage
Diffstat (limited to 'FEAST/MIToolbox/RenyiEntropy.c')
| -rw-r--r-- | FEAST/MIToolbox/RenyiEntropy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FEAST/MIToolbox/RenyiEntropy.c b/FEAST/MIToolbox/RenyiEntropy.c index 32c5ff9..c0c4bd4 100644 --- a/FEAST/MIToolbox/RenyiEntropy.c +++ b/FEAST/MIToolbox/RenyiEntropy.c @@ -33,6 +33,7 @@ #include "ArrayOperations.h" #include "CalculateProbability.h" #include "Entropy.h" +#include "util.h" double calculateRenyiEntropy(double alpha, double *dataVector, int vectorLength) { @@ -111,8 +112,8 @@ double calcCondRenyiEnt(double alpha, double *dataVector, double *conditionVecto ** first generate the seperate variables */ - double *seperateVectors = (double *) CALLOC_FUNC(uniqueInCondVector*vectorLength,sizeof(double)); - int *seperateVectorCount = (int *) CALLOC_FUNC(uniqueInCondVector,sizeof(int)); + double *seperateVectors = safe_calloc(uniqueInCondVector*vectorLength,sizeof(double)); + int *seperateVectorCount = safe_calloc(uniqueInCondVector,sizeof(int)); double seperateVectorProb = 0.0; int i,j; double entropy = 0.0; @@ -121,7 +122,7 @@ double calcCondRenyiEnt(double alpha, double *dataVector, double *conditionVecto double tempEntropy; ProbabilityState state; - double **seperateVectors2D = (double **) CALLOC_FUNC(uniqueInCondVector,sizeof(double*)); + double **seperateVectors2D = safe_calloc(uniqueInCondVector,sizeof(double*)); for(j=0; j < uniqueInCondVector; j++) seperateVectors2D[j] = seperateVectors + (int)j*vectorLength; |