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

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

diff --git a/code/stage1/src/TimeSeries/serialize.c b/code/stage1/src/TimeSeries/serialize.c
index 3caa371..ba52c87 100644 (file)
--- a/code/stage1/src/TimeSeries/serialize.c
+++ b/code/stage1/src/TimeSeries/serialize.c
@@ -22,7 +22,7 @@ static void scan_line(FILE* ifile, int posID, uint32_t* ID, int posPower, float*
                }
                else if (position == posPower)
                {
-                       Real power;
+                       float power;
                        nextChar = readReal(ifile, &power);
                        *rawPower = (float) power;
                }
@@ -250,11 +250,11 @@ void serialize_byRows(const char* ifileName, const char* ofileName, uint32_t nbI
        uint32_t tsLength = 4*nbValues+4;
        FILE* ofile = fopen(ofileName, "wb");
        Byte intBuffer[4];
-       write_int(nbSeries, 4, intBuffer);
+       write_int(nbSeries, intBuffer);
        fwrite(intBuffer, 1, 4, ofile);
-       write_int(tsLength, 4, intBuffer);
+       write_int(tsLength, intBuffer);
        fwrite(intBuffer, 1, 4, ofile);
-       Real rawPower;
+       float rawPower;
        int64_t ID;
 
        for (uint32_t i=0; i<nbSeries; i++)
@@ -264,7 +264,7 @@ void serialize_byRows(const char* ifileName, const char* ofileName, uint32_t nbI
                        curChar = fgetc(ifile);
                ungetc(curChar, ifile);
                curChar = readInt(ifile, &ID);
-               write_int((uint32_t)ID, 4, intBuffer);
+               write_int((uint32_t)ID, intBuffer);
                fwrite(intBuffer, 1, 4, ofile);
                while (curChar == ',')
                        curChar = fgetc(ifile);