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

[epclust.git] / code / stage1 / src / TimeSeries / deserialize.c

diff --git a/code/stage1/src/TimeSeries/deserialize.c b/code/stage1/src/TimeSeries/deserialize.c
index 79f7843..e142fe3 100644 (file)
--- a/code/stage1/src/TimeSeries/deserialize.c
+++ b/code/stage1/src/TimeSeries/deserialize.c
@@ -37,7 +37,7 @@ PowerCurve* deserialize(const char* ifileName, const char* ofileName,
                if (!ofile)
                {
                        powerCurve = powerCurves + i;
-                       powerCurve->values = (Real*) malloc(valuesPerSerie * sizeof(Real));
+                       powerCurve->values = (float*) malloc(valuesPerSerie * sizeof(float));
                }
                
                // translate 4-bytes binary integer into integer ID
@@ -45,14 +45,14 @@ PowerCurve* deserialize(const char* ifileName, const char* ofileName,
                size_t lengthRead = fread(binaryID, 4, 1, ifile);
                if (lengthRead != 1)
                        fprintf(stderr,"Warning: deserializing truncated binary file.\n");
-               uint32_t ID = bInt_to_uint((Byte*) binaryID, 4);
+               uint32_t ID = bInt_to_uint((Byte*) binaryID);
                free(binaryID);
                if (ofile)
                        fprintf(ofile, "%u,", ID);
                else
                        powerCurve->ID = ID;
 
-               // translate 4-bytes binary integers into Real
+               // translate 4-bytes binary integers into float
                Byte* binarySerie = (Byte*) malloc(4 * valuesPerSerie);
                lengthRead = fread(binarySerie, 1, 4*valuesPerSerie, ifile);
                //TODO: assert that lengthRead == 4*valuesPerSerie (...)