From 6112708638c33b2d59968638fb6d43327b629fb7 Mon Sep 17 00:00:00 2001 From: skeating Date: Thu, 21 Sep 2023 11:08:59 +0100 Subject: [PATCH] Added MATLAB binding for the new FBC variables --- src/bindings/matlab/getDefaultValues.m | 5 +++-- src/bindings/matlab/getStructureEnum.m | 5 +++-- src/bindings/matlab/getStructureFieldnames.m | 5 +++-- src/bindings/matlab/getValueType.m | 5 +++-- src/bindings/matlab/test/testReadFromFileFbc2.m | 2 +- src/bindings/matlab/test/testReadFromFileFbc3.m | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/bindings/matlab/getDefaultValues.m b/src/bindings/matlab/getDefaultValues.m index 4913b9fd82..8aca17d09a 100644 --- a/src/bindings/matlab/getDefaultValues.m +++ b/src/bindings/matlab/getDefaultValues.m @@ -3330,6 +3330,7 @@ '', ... '', ... '', ... + '', ... 0/0, ... int32(0), ... '', ... @@ -3337,7 +3338,7 @@ int32(version), ... int32(3), ... }; - nNumberFields = 15; + nNumberFields = 16; end end end @@ -3566,7 +3567,7 @@ '', ... '', ... '', ... - int32(0), ... + '', ... '', ... '', ... int32(3), ... diff --git a/src/bindings/matlab/getStructureEnum.m b/src/bindings/matlab/getStructureEnum.m index ae04b5705d..4bf2e3e058 100644 --- a/src/bindings/matlab/getStructureEnum.m +++ b/src/bindings/matlab/getStructureEnum.m @@ -3005,6 +3005,7 @@ {'fbc_id', 'id', 'fbc', 1, 20}, ... {'fbc_name', 'name', 'fbc', 1, 20}, ... {'fbc_reaction', 'reaction', 'fbc', 1, 20}, ... + {'fbc_reaction2', 'reaction2', 'fbc', 1, 20}, ... {'fbc_coefficient', 'coefficient', 'fbc', 1, 20}, ... {'isSetfbc_coefficient', 'coefficient', 'fbc', 0, 7}, ... {'fbc_variableType', 'variableType', 'fbc', 1, 20}, ... @@ -3012,7 +3013,7 @@ {'version', '', '', 0, 0}, ... {'fbc_version', 'version', 'fbc', 1, 20}, ... }; - nNumberFields = 15; + nNumberFields = 16; end end end @@ -3241,8 +3242,8 @@ {'fbc_id', 'id', 'fbc', 1, 20}, ... {'fbc_name', 'name', 'fbc', 1, 20}, ... {'fbc_coefficient', 'coefficient', 'fbc', 1, 20}, ... - {'isSetfbc_coefficient', 'coefficient', 'fbc', 0, 7}, ... {'fbc_variable', 'variable', 'fbc', 1, 20}, ... + {'fbc_variable2', 'variable2', 'fbc', 1, 20}, ... {'fbc_variableType', 'variableType', 'fbc', 1, 20}, ... {'level', '', '', 0, 0}, ... {'version', '', '', 0, 0}, ... diff --git a/src/bindings/matlab/getStructureFieldnames.m b/src/bindings/matlab/getStructureFieldnames.m index 209fab1667..7a7e415b6c 100644 --- a/src/bindings/matlab/getStructureFieldnames.m +++ b/src/bindings/matlab/getStructureFieldnames.m @@ -3382,6 +3382,7 @@ 'fbc_id', ... 'fbc_name', ... 'fbc_reaction', ... + 'fbc_reaction2', ... 'fbc_coefficient', ... 'isSetfbc_coefficient', ... 'fbc_variableType', ... @@ -3389,7 +3390,7 @@ 'version', ... 'fbc_version', ... }; - nNumberFields = 15; + nNumberFields = 16; end end end @@ -3618,8 +3619,8 @@ 'fbc_id', ... 'fbc_name', ... 'fbc_coefficient', ... - 'isSetfbc_coefficient', ... 'fbc_variable', ... + 'fbc_variable2', ... 'fbc_variableType', ... 'level', ... 'version', ... diff --git a/src/bindings/matlab/getValueType.m b/src/bindings/matlab/getValueType.m index 4a45982f63..2b92671b9c 100644 --- a/src/bindings/matlab/getValueType.m +++ b/src/bindings/matlab/getValueType.m @@ -3333,6 +3333,7 @@ 'char', ... 'char', ... 'char', ... + 'char', ... 'double', ... 'bool', ... 'char', ... @@ -3340,7 +3341,7 @@ 'uint', ... 'uint', ... }; - nNumberFields = 15; + nNumberFields = 16; end end end @@ -3569,7 +3570,7 @@ 'char', ... 'char', ... 'char', ... - 'bool', ... + 'char', ... 'char', ... 'char', ... 'uint', ... diff --git a/src/bindings/matlab/test/testReadFromFileFbc2.m b/src/bindings/matlab/test/testReadFromFileFbc2.m index 36ce6b9a95..7745db8979 100644 --- a/src/bindings/matlab/test/testReadFromFileFbc2.m +++ b/src/bindings/matlab/test/testReadFromFileFbc2.m @@ -80,7 +80,7 @@ Totalfail = Totalfail + fail_unless( strcmp(m.fbc_objective(1).fbc_fluxObjective(1).typecode, 'SBML_FBC_FLUXOBJECTIVE')); Totalfail = Totalfail + fail_unless( strcmp(m.fbc_objective(1).fbc_fluxObjective(1).fbc_reaction, 'R1')); Totalfail = Totalfail + fail_unless( m.fbc_objective(1).fbc_fluxObjective(1).fbc_coefficient == 1); - Totalfail = Totalfail + fail_unless( m.fbc_objective(1).fbc_fluxObjective(1).isSetfbc_coefficient == 1); + Totalfail = Totalfail + fail_unless( strcmp(m.fbc_activeObjective, 'c')); diff --git a/src/bindings/matlab/test/testReadFromFileFbc3.m b/src/bindings/matlab/test/testReadFromFileFbc3.m index d554c941c9..10cde3ee15 100644 --- a/src/bindings/matlab/test/testReadFromFileFbc3.m +++ b/src/bindings/matlab/test/testReadFromFileFbc3.m @@ -51,7 +51,7 @@ Totalfail = Totalfail + fail_unless( strcmp(m.fbc_objective(1).fbc_fluxObjective(1).typecode, 'SBML_FBC_FLUXOBJECTIVE')); Totalfail = Totalfail + fail_unless( strcmp(m.fbc_objective(1).fbc_fluxObjective(1).fbc_reaction, 'R1')); Totalfail = Totalfail + fail_unless( m.fbc_objective(1).fbc_fluxObjective(1).fbc_coefficient == 1); - Totalfail = Totalfail + fail_unless( m.fbc_objective(1).fbc_fluxObjective(1).isSetfbc_coefficient == 1); + Totalfail = Totalfail + fail_unless( strcmp(m.fbc_activeObjective, 'c')); @@ -77,7 +77,7 @@ Totalfail = Totalfail + fail_unless( strcmp(m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).typecode, 'SBML_FBC_USERDEFINEDCONSTRAINTCOMPONENT')); Totalfail = Totalfail + fail_unless( strcmp(m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).fbc_id, 'dd')); - Totalfail = Totalfail + fail_unless( m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).isSetfbc_coefficient == 1); + Totalfail = Totalfail + fail_unless( strcmp(m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).fbc_coefficient, 'uc2ub')); Totalfail = Totalfail + fail_unless( strcmp(m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).fbc_variable, 'R2')); Totalfail = Totalfail + fail_unless( strcmp(m.fbc_userDefinedConstraint(1).fbc_userDefinedConstraintComponent(1).fbc_variableType, 'linear'));