FIX: C code (double, float, ...) + wrapper (read/write data, get medoids)

[epclust.git] / code / stage1 / src / Classification / getClass.c

diff --git a/code/stage1/src/Classification/getClass.c b/code/stage1/src/Classification/getClass.c
index aed1467..acec167 100644 (file)
--- a/code/stage1/src/Classification/getClass.c
+++ b/code/stage1/src/Classification/getClass.c
@@ -12,14 +12,14 @@ uint32_t* get_class(PowerCurve* data, uint32_t nbSeries, PowerCurve* medoids,
        uint32_t nbReducedCoordinates = (uint32_t)ceil(log2(nbValues));
 
        // Preprocessing to reduce dimension of both data and medoids
-       Real* reducedCoordinates_data = (Real*) malloc(nbSeries * nbReducedCoordinates * sizeof(Real));
+       float* reducedCoordinates_data = (float*) malloc(nbSeries * nbReducedCoordinates * sizeof(float));
        compute_coefficients(data, nbSeries, nbValues, 
                reducedCoordinates_data, 0, nbReducedCoordinates);
-       Real* reducedCoordinates_medoids = (Real*) malloc(nbClusters * nbReducedCoordinates * sizeof(Real));
+       float* reducedCoordinates_medoids = (float*) malloc(nbClusters * nbReducedCoordinates * sizeof(float));
        compute_coefficients(medoids, nbClusters, nbValues, 
                reducedCoordinates_medoids, 0, nbReducedCoordinates);
        
-       Real* dissimilarities = get_dissimilarities_inter(reducedCoordinates_data, nbSeries, 
+       float* dissimilarities = get_dissimilarities_inter(reducedCoordinates_data, nbSeries, 
                reducedCoordinates_medoids, nbClusters, nbReducedCoordinates, p_for_dissims);
        free(reducedCoordinates_data);
        free(reducedCoordinates_medoids);
@@ -29,7 +29,7 @@ uint32_t* get_class(PowerCurve* data, uint32_t nbSeries, PowerCurve* medoids,
        for (uint32_t i=0; i<nbSeries; i++)
        {
                uint32_t minIndex = 0;
-               Real minDissim = dissimilarities[i*nbClusters + 0];
+               float minDissim = dissimilarities[i*nbClusters + 0];
                for (uint32_t j=1; j<nbClusters; j++)
                {
                        if (dissimilarities[i*nbClusters + j] < minDissim)