Skip to content

Commit

Permalink
Make CSV/EPW/JSON I/O testable by only disabling MATIO
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbeu
tbeu committed Apr 2, 2024
1 parent 24cdadb commit 34411c9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 209 deletions.
2 changes: 1 addition & 1 deletion ModelicaTableAdditions/Resources/BuildProjects/CMake/src.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if(MODELICA_DUMMY_FUNCTION_USERTAB OR BUILD_TESTING)
target_compile_definitions(ModelicaTableAdditions PRIVATE -DDUMMY_FUNCTION_USERTAB=1)
endif()
if(BUILD_TESTING)
target_compile_definitions(ModelicaIOAdditions PRIVATE -DNO_FILE_SYSTEM=1)
target_compile_definitions(ModelicaIOAdditions PRIVATE -DNO_MATIO=1)
endif()

install(
Expand Down
1 change: 1 addition & 0 deletions ModelicaTableAdditions/Resources/BuildProjects/CMake/test.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ if(EXISTS "${MODELICA_TABLE_ADDITIONS_TEST_DIR}")
target_link_libraries(Test${TEST} PRIVATE
ModelicaTableAdditions
ModelicaIOAdditions
parson
gtest
)
if(UNIX)
Expand Down
170 changes: 8 additions & 162 deletions ModelicaTableAdditions/Resources/C-Sources/ModelicaIOAdditions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
#include <xlocale.h>
#endif
#endif
#if !defined(NO_MATIO)
#include "ModelicaMatIO.h"
#endif
#include "parson.h"

/* The standard way to detect POSIX is to check _POSIX_VERSION,
Expand Down Expand Up @@ -224,6 +226,7 @@ double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
#endif
#endif

#if !defined(NO_MATIO)
typedef struct MatIO {
mat_t* mat; /* Pointer to MAT-file */
matvar_t* matvar; /* Pointer to MAT-file variable for data */
Expand All @@ -244,6 +247,7 @@ static void readMatIO(_In_z_ const char* fileName, _In_z_ const char* matrixName
static void readRealMatIO(_In_z_ const char* fileName, _In_z_ const char* matrixName,
_Inout_ MatIO* matio);
/* Read a real variable from a MATLAB MAT-file using MatIO functions */
#endif

static double* readCsvTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n, _In_z_ const char* delimiter,
Expand Down Expand Up @@ -288,168 +292,6 @@ static void transpose(_Inout_ double* table, size_t nRow, size_t nCol) MODELICA_
#pragma clang diagnostic ignored "-Wtautological-compare"
#endif

void ModelicaIOAdditions_readMatrixSizes(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_Out_ int* dim) {
MatIO matio = {NULL, NULL, NULL};

dim[0] = 0;
dim[1] = 0;

readRealMatIO(fileName, matrixName, &matio);
if (NULL != matio.matvar) {
matvar_t* matvar = matio.matvar;

dim[0] = (int)matvar->dims[0];
dim[1] = (int)matvar->dims[1];
}

Mat_VarFree(matio.matvarRoot);
(void)Mat_Close(matio.mat);
}

void ModelicaIOAdditions_readRealMatrix(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_Inout_ double* matrix, size_t m, size_t n,
int verbose) {
MatIO matio = {NULL, NULL, NULL};
int readError = 0;

if (verbose == 1) {
/* Print info message, that matrix / file is loading */
ModelicaFormatMessage("... loading \"%s\" from \"%s\"\n",
matrixName, fileName);
}

readRealMatIO(fileName, matrixName, &matio);
if (NULL != matio.matvar) {
matvar_t* matvar = matio.matvar;

/* Check if number of rows matches */
if (m != matvar->dims[0]) {
Mat_VarFree(matio.matvarRoot);
(void)Mat_Close(matio.mat);
ModelicaFormatError(
"Cannot read %lu rows of array \"%s(%lu,%lu)\" "
"from file \"%s\"\n", (unsigned long)m, matrixName,
(unsigned long)matvar->dims[0], (unsigned long)matvar->dims[1],
fileName);
return;
}

/* Check if number of columns matches */
if (n != matvar->dims[1]) {
Mat_VarFree(matio.matvarRoot);
(void)Mat_Close(matio.mat);
ModelicaFormatError(
"Cannot read %lu columns of array \"%s(%lu,%lu)\" "
"from file \"%s\"\n", (unsigned long)n, matrixName,
(unsigned long)matvar->dims[0], (unsigned long)matvar->dims[1],
fileName);
return;
}

{
int start[2] = {0, 0};
int stride[2] = {1, 1};
int edge[2];
edge[0] = (int)matvar->dims[0];
edge[1] = (int)matvar->dims[1];
readError = Mat_VarReadData(matio.mat, matvar, matrix, start, stride, edge);
}
}

Mat_VarFree(matio.matvarRoot);
(void)Mat_Close(matio.mat);

if (readError == 0 && NULL != matrix) {
/* Array is stored column-wise -> need to transpose */
transpose(matrix, m, n);
}
else {
ModelicaFormatError(
"Error when reading numeric data of matrix \"%s(%lu,%lu)\" "
"from file \"%s\"\n", matrixName, (unsigned long)m,
(unsigned long)n, fileName);
}
}

int ModelicaIOAdditions_writeRealMatrix(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_In_ double* matrix, size_t m, size_t n,
int append,
_In_z_ const char* version) {
int status;
mat_t* mat;
matvar_t* matvar;
size_t dims[2];
double* aT;
enum mat_ft matv;
enum matio_compression matc;

if ((0 != strcmp(version, "4")) && (0 != strcmp(version, "6")) && (0 != strcmp(version, "7")) && (0 != strcmp(version, "7.3"))) {
ModelicaFormatError("Invalid version %s for file \"%s\"\n", version, fileName);
return 0;
}
if (0 == strcmp(version, "4")) {
matv = MAT_FT_MAT4;
matc = MAT_COMPRESSION_NONE;
}
else if (0 == strcmp(version, "7.3")) {
matv = MAT_FT_MAT73;
matc = MAT_COMPRESSION_ZLIB;
}
else if (0 == strcmp(version, "7")) {
matv = MAT_FT_MAT5;
matc = MAT_COMPRESSION_ZLIB;
}
else {
matv = MAT_FT_MAT5;
matc = MAT_COMPRESSION_NONE;
}

if (append == 0) {
mat = Mat_CreateVer(fileName, NULL, matv);
if (NULL == mat) {
ModelicaFormatError("Not possible to newly create file \"%s\"\n(maybe version 7.3 not supported)\n", fileName);
return 0;
}
} else {
mat = Mat_Open(fileName, (int)MAT_ACC_RDWR | matv);
if (NULL == mat) {
ModelicaFormatError("Not possible to open file \"%s\"\n", fileName);
return 0;
}
}

/* MAT file array is stored column-wise -> need to transpose */
aT = (double*)malloc(m*n*sizeof(double));
if (NULL == aT) {
(void)Mat_Close(mat);
ModelicaError("Memory allocation error\n");
return 0;
}
memcpy(aT, matrix, m*n*sizeof(double));
transpose(aT, n, m);

if (append != 0) {
(void)Mat_VarDelete(mat, matrixName);
}

dims[0] = m;
dims[1] = n;
matvar = Mat_VarCreate(matrixName, MAT_C_DOUBLE, MAT_T_DOUBLE, 2, dims, aT, MAT_F_DONT_COPY_DATA);
status = Mat_VarWrite(mat, matvar, matc);
Mat_VarFree(matvar);
(void)Mat_Close(mat);
free(aT);
if (status != 0) {
ModelicaFormatError("Cannot write variable \"%s\" to \"%s\"\n", matrixName, fileName);
return 0;
}
return 1;
}

double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
_In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n,
Expand Down Expand Up @@ -494,7 +336,9 @@ double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
}

if (isMatExt == 1) {
#if !defined(NO_MATIO)
table = readMatTable(fileName, tableName, m, n);
#endif
}
else if (isCsvExt == 1) {
table = readCsvTable(fileName, tableName, m, n, delimiter, nHeaderLines);
Expand All @@ -511,6 +355,7 @@ double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
return table;
}

#if !defined(NO_MATIO)
static double* readMatTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n) {
double* table = NULL;
Expand Down Expand Up @@ -741,6 +586,7 @@ static void readRealMatIO(_In_z_ const char* fileName,
}
}
}
#endif

static int IsNumber(char* token) {
int foundExponentSign = 0;
Expand Down
47 changes: 1 addition & 46 deletions ModelicaTableAdditions/Resources/C-Sources/ModelicaIOAdditions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
NO_FILE_SYSTEM : A file system is not present (e.g. on dSPACE or xPC).
NO_LOCALE : locale.h is not present (e.g. on AVR).
NO_MATIO : ModelicaMatio.h is not present.
MODELICA_EXPORT: Prefix used for function calls. If not defined, blank is used
Useful definition:
- "__declspec(dllexport)" if included in a DLL and the
Expand Down Expand Up @@ -83,52 +84,6 @@
#define _Out_
#endif

MODELICA_EXPORT void ModelicaIOAdditions_readMatrixSizes(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_Out_ int* dim) MODELICA_NONNULLATTR;
/* Read matrix dimensions from file
-> fileName: Name of file
-> matrixName: Name of matrix
-> dim: Output array for number of rows and columns
*/

MODELICA_EXPORT void ModelicaIOAdditions_readRealMatrix(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_Inout_ double* matrix, size_t m, size_t n,
int verbose) MODELICA_NONNULLATTR;
/* Read matrix from file
-> fileName: Name of file
-> matrixName: Name of matrix
-> matrix: Output array of dimensions m by n
-> m: Number of rows
-> n: Number of columns
-> verbose: Print message that file is loading
*/

MODELICA_EXPORT int ModelicaIOAdditions_writeRealMatrix(_In_z_ const char* fileName,
_In_z_ const char* matrixName,
_In_ double* matrix, size_t m, size_t n,
int append,
_In_z_ const char* version) MODELICA_NONNULLATTR;
/* Write matrix to file
-> fileName: Name of file
-> matrixName: Name of matrix
-> matrix: Input array of dimensions m by n
-> m: Number of rows
-> n: Number of columns
-> append: File append flag
= 1: if matrix is to be appended to (existing) file,
= 0: if file is to be newly created
-> version: Desired file version
= "4": MATLAB MAT-file of version 4
= "6": MATLAB MAT-file of version 6
= "7": MATLAB MAT-file of version 7
= "7.3": MATLAB MAT-file of version 7.3
*/

MODELICA_EXPORT double* ModelicaIOAdditions_readRealTable(_In_z_ const char* fileName,
_In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n,
Expand Down

0 comments on commit 34411c9

Please sign in to comment.