Skip to content

Check nValues in get*/set* functions #689

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

Merged
t-sommer merged 1 commit into from
Aug 12, 2026
Merged

Check nValues in get*/set* functions #689

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions BouncingBall/model.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,35 @@ Status calculateValues(ModelInstance *comp) {
Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_t nValues, size_t* index) {
ASSERT_NOT_NULL2(comp);
ASSERT_NOT_NULL2(values);
ASSERT_SIZE_T(nValues, 1);
ASSERT_NOT_NULL2(index);

calculateValues(comp);

switch (vr) {
case vr_time:
ASSERT_NVALUES(1);
values[(*index)++] = comp->time;
return OK;
case vr_h:
ASSERT_NVALUES(1);
values[(*index)++] = M(h);
return OK;
case vr_der_h:
case vr_v:
ASSERT_NVALUES(1);
values[(*index)++] = M(v);
return OK;
case vr_der_v:
case vr_g:
ASSERT_NVALUES(1);
values[(*index)++] = M(g);
return OK;
case vr_e:
ASSERT_NVALUES(1);
values[(*index)++] = M(e);
return OK;
case vr_v_min:
ASSERT_NVALUES(1);
values[(*index)++] = V_MIN;
return OK;
default:
Expand All @@ -66,7 +71,6 @@ Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_
Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[], size_t nValues, size_t* index) {
ASSERT_NOT_NULL2(comp);
ASSERT_NOT_NULL2(values);
ASSERT_SIZE_T(nValues, 1);
ASSERT_NOT_NULL2(index);

switch (vr) {
Expand All @@ -79,6 +83,7 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
logError(comp, "Variable \"h\" can only be set in Instantiated Mode, Initialization Mode, Continuous Time Mode, and Event Mode.");
return Error;
}
ASSERT_NVALUES(1);
M(h) = values[(*index)++];
break;

Expand All @@ -90,6 +95,7 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
logError(comp, "Variable \"v\" can only be set in Instantiated Mode, Initialization Mode, Continuous Time Mode, and Event Mode.");
return Error;
}
ASSERT_NVALUES(1);
M(v) = values[(*index)++];
break;

Expand All @@ -100,6 +106,7 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
logError(comp, "Variable g can only be set after instantiation or in initialization mode.");
return Error;
}
ASSERT_NVALUES(1);
M(g) = values[(*index)++];
break;

Expand All @@ -111,6 +118,7 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
logError(comp, "Variable e can only be set after instantiation, in initialization mode or event mode.");
return Error;
}
ASSERT_NVALUES(1);
M(e) = values[(*index)++];
break;

Expand Down
8 changes: 6 additions & 2 deletions Dahlquist/model.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,25 @@ Status calculateValues(ModelInstance *comp) {
Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_t nValues, size_t* index) {
ASSERT_NOT_NULL2(comp);
ASSERT_NOT_NULL2(values);
ASSERT_SIZE_T(nValues, 1);
ASSERT_NOT_NULL2(index);

calculateValues(comp);

switch (vr) {
case vr_time:
ASSERT_NVALUES(1);
values[(*index)++] = comp->time;
return OK;
case vr_x:
ASSERT_NVALUES(1);
values[(*index)++] = M(x);
return OK;
case vr_der_x:
ASSERT_NVALUES(1);
values[(*index)++] = M(der_x);
return OK;
case vr_k:
ASSERT_NVALUES(1);
values[(*index)++] = M(k);
return OK;
default:
Expand All @@ -53,11 +56,11 @@ Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_
Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[], size_t nValues, size_t* index) {
ASSERT_NOT_NULL2(comp);
ASSERT_NOT_NULL2(values);
ASSERT_SIZE_T(nValues, 1);
ASSERT_NOT_NULL2(index);

switch (vr) {
case vr_x:
ASSERT_NVALUES(1);
M(x) = values[(*index)++];
break;
case vr_k:
Expand All @@ -67,6 +70,7 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
logError(comp, "Variable k can only be set after instantiation or in initialization mode.");
return Error;
}
ASSERT_NVALUES(1);
M(k) = values[(*index)++];
break;
default:
Expand Down
Loading