Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle different boolean sizes in FMIRecorderWriteCSV() #611

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Handle different boolean sizes in FMIRecorderWriteCSV() #611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions fmusim/FMIRecorder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ FMIStatus FMISample(FMIInstance* instance, double time, FMIRecorder* recorder) {
return status;
}

static void print_value(FILE* file, FMIVariableType type, void* value) {
static void print_value(FILE* file, FMIVariableType type, FMIMajorVersion fmiMajorVersion, void* value) {

size_t size = 3;

Expand Down Expand Up @@ -247,7 +247,17 @@ static void print_value(FILE* file, FMIVariableType type, void* value) {
fprintf(file, "%" PRIu64, *((fmi3UInt64*)value));
break;
case FMIBooleanType:
fprintf(file, "%d", *((fmi3Boolean*)value));
switch (fmiMajorVersion) {
case FMIMajorVersion1:
fprintf(file, "%d", *((fmi1Boolean*)value));
break;
case FMIMajorVersion2:
fprintf(file, "%d", *((fmi2Boolean*)value));
break;
case FMIMajorVersion3:
fprintf(file, "%d", *((fmi3Boolean*)value));
break;
}
break;
case FMIStringType:
fprintf(file, "\"%s\"", *((fmi3String*)value));
Expand Down Expand Up @@ -299,11 +309,13 @@ FMIStatus FMIRecorderWriteCSV(FMIRecorder* recorder, FILE* file) {

fputc('\n', file);

const FMIMajorVersion fmiMajorVersion = recorder->instance->fmiMajorVersion;

for (size_t i = 0; i < recorder->nRows; i++) {

Row* row = recorder->rows[i];

print_value(file, FMIFloat64Type, &row->time);
print_value(file, FMIFloat64Type, FMIMajorVersion3, &row->time);

for (size_t j = 0; j < N_VARIABLE_TYPES; j++) {

Expand All @@ -316,7 +328,7 @@ FMIStatus FMIRecorderWriteCSV(FMIRecorder* recorder, FILE* file) {
}

const FMIVariableType type = (FMIVariableType)j;
const size_t size = FMISizeOfVariableType(type, FMIMajorVersion3);
const size_t size = FMISizeOfVariableType(type, fmiMajorVersion);
char* value = (char*)row->values[j];

for (size_t k = 0; k < info->nVariables; k++) {
Expand All @@ -329,7 +341,7 @@ FMIStatus FMIRecorderWriteCSV(FMIRecorder* recorder, FILE* file) {
fputc(' ', file);
}

print_value(file, type, value);
print_value(file, type, fmiMajorVersion, value);

value += size;
}
Expand Down
Loading