X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=code%2Fstage1%2Fsrc%2FTimeSeries%2Fdeserialize.c;h=e142fe3616a10612347d10cbaff5342a2d575b8f;hb=73d68777d709e054cf74e806e23b0bdefda9462a;hp=79f784307f1c8bc89e6512820422d6345eff6c78;hpb=f9f51b6ab4c7280dd521da675353252d7b078984;p=epclust.git

diff --git a/code/stage1/src/TimeSeries/deserialize.c b/code/stage1/src/TimeSeries/deserialize.c
index 79f7843..e142fe3 100644
--- 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 (...)