From e2b1a645bd4a62191b4bc6a7ddaec815f698ffdd Mon Sep 17 00:00:00 2001 From: Iakov Nakhimovski Date: Fri, 13 Jan 2023 14:47:01 +0100 Subject: [PATCH] fix: update reference modelica structure to json --- ...sts_CustomFunctions1_SpringDamper1_OCT.txt | 164 ++++------------- .../RegressionTests_Test1_TestMdl1_OCT.txt | 166 +++++------------- .../RegressionTests_Test2_TestMdl1_OCT.txt | 166 +++++------------- .../RegressionTests_Test2_TestMdl2_OCT.txt | 166 +++++------------- .../RegressionTests_Test3_TestMdl1_OCT.txt | 166 +++++------------- 5 files changed, 198 insertions(+), 630 deletions(-) diff --git a/ReferenceFiles/RegressionTests_CustomFunctions1_SpringDamper1_OCT.txt b/ReferenceFiles/RegressionTests_CustomFunctions1_SpringDamper1_OCT.txt index 7cbe6e0..d08b92d 100644 --- a/ReferenceFiles/RegressionTests_CustomFunctions1_SpringDamper1_OCT.txt +++ b/ReferenceFiles/RegressionTests_CustomFunctions1_SpringDamper1_OCT.txt @@ -1,126 +1,38 @@ -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 10( 10 scalars) - Number of Real independent parameters: 6( 6 scalars) - Number of Integer independent parameters: 0( 0 scalars) - Number of Enum independent parameters: 2( 2 scalars) - Number of Boolean independent parameters: 2( 2 scalars) - Number of String independent parameters: 0( 0 scalars) -Number of dependent parameters: 1( 1 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 1( 1 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 20( 20 scalars) - Number of Real variables: 20( 20 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 0( 0 scalars) -Number of Real derivative variables: 0( 0 scalars) -Number of Real continous algebraic variables: 20( 20 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 0( 0 scalars) - Number of Real discrete variables: 0( 0 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 20( 20 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 20( 20 scalars) -Number of initial equations: 0( 0 scalars) -Number of event indicators in equations: 0 -Number of event indicators in init equations: 0 -Number of independent constants: 1( 1 scalars) - Number of Real independent constants: 1( 1 scalars) - Number of Real independent constants: 1( 1 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 118( 118 scalars) - Number of Real independent parameters: 34( 34 scalars) - Number of Integer independent parameters: 19( 19 scalars) - Number of Enum independent parameters: 2( 2 scalars) - Number of Boolean independent parameters: 58( 58 scalars) - Number of String independent parameters: 5( 5 scalars) -Number of dependent parameters: 7( 7 scalars) - Number of Real dependent parameters: 6( 6 scalars) - Number of Integer dependent parameters: 1( 1 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 13( 13 scalars) - Number of Real variables: 13( 13 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 2( 2 scalars) -Number of Real derivative variables: 2( 2 scalars) -Number of Real continous algebraic variables: 9( 9 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 0( 0 scalars) - Number of Real discrete variables: 0( 0 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 11( 11 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 11( 11 scalars) -Number of initial equations: 2( 2 scalars) -Number of event indicators in equations: 0 -Number of event indicators in init equations: 0 +{ + "RegressionTests.CustomFunctions1.SpringDamper1": { + "number_of_equations": 11, + "number_of_event_indicators": 0, + "time_events": false, + "step_events": false, + "states": { + "number_of_states": 2, + "list_of_states": [ + { + "state": "springDamper.phi_rel", + "attributes": { + "start": "0", + "nominal": 1.0E-4 + } + }, + { + "state": "springDamper.w_rel", + "attributes": { + "start": "0" + } + } + ] + }, + "Initialization_System": { + "number_of_blocks": 0, + "blocks": [] + }, + "System": { + "number_of_blocks": 0, + "blocks": [] + }, + "directional_derivatives": { + "compute": false, + "external_functions_no_derivative_annotation": [] + } + } +} \ No newline at end of file diff --git a/ReferenceFiles/RegressionTests_Test1_TestMdl1_OCT.txt b/ReferenceFiles/RegressionTests_Test1_TestMdl1_OCT.txt index c78f55f..6af08b9 100644 --- a/ReferenceFiles/RegressionTests_Test1_TestMdl1_OCT.txt +++ b/ReferenceFiles/RegressionTests_Test1_TestMdl1_OCT.txt @@ -1,126 +1,40 @@ -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 31( 29 scalars) - Number of Real independent parameters: 12( 10 scalars) - Number of Integer independent parameters: 4( 4 scalars) - Number of Enum independent parameters: 6( 6 scalars) - Number of Boolean independent parameters: 7( 7 scalars) - Number of String independent parameters: 2( 2 scalars) -Number of dependent parameters: 17( 17 scalars) - Number of Real dependent parameters: 12( 12 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 1( 1 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 28( 28 scalars) - Number of Real variables: 28( 28 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 0( 0 scalars) -Number of Real derivative variables: 0( 0 scalars) -Number of Real continous algebraic variables: 24( 24 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 4( 4 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 28( 28 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 28( 28 scalars) -Number of initial equations: 0( 0 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 131( 131 scalars) - Number of Real independent parameters: 37( 37 scalars) - Number of Integer independent parameters: 22( 22 scalars) - Number of Enum independent parameters: 4( 4 scalars) - Number of Boolean independent parameters: 60( 60 scalars) - Number of String independent parameters: 8( 8 scalars) -Number of dependent parameters: 19( 19 scalars) - Number of Real dependent parameters: 14( 14 scalars) - Number of Integer dependent parameters: 1( 1 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 16( 16 scalars) - Number of Real variables: 14( 14 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 2( 2 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 1( 1 scalars) -Number of Real derivative variables: 1( 1 scalars) -Number of Real continous algebraic variables: 8( 8 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 6( 6 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 2( 2 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 17( 15 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 17( 15 scalars) -Number of initial equations: 7( 7 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 +{ + "RegressionTests.Test1.TestMdl1": { + "number_of_equations": 17, + "number_of_event_indicators": 0, + "time_events": true, + "step_events": false, + "states": { + "number_of_states": 1, + "list_of_states": [ + { + "state": "heatCapacitor.T", + "attributes": { + "start": "293.15", + "displayUnit": "\"degC\"" + } + } + ] + }, + "Initialization_System": { + "number_of_blocks": 0, + "blocks": [] + }, + "System": { + "number_of_blocks": 0, + "blocks": [] + }, + "directional_derivatives": { + "compute": false, + "external_functions_no_derivative_annotation": [ + "Modelica.Blocks.Tables.Internal.getTimeTableTmin", + "Modelica.Blocks.Types.ExternalCombiTimeTable.destructor", + "Modelica.Blocks.Tables.Internal.getTimeTableTmax", + "Modelica.Blocks.Types.ExternalCombiTimeTable.constructor", + "Modelica.Utilities.Strings.Advanced.skipWhiteSpace", + "Modelica.Utilities.Strings.length", + "Modelica.Blocks.Tables.Internal.getNextTimeEvent" + ] + } + } +} \ No newline at end of file diff --git a/ReferenceFiles/RegressionTests_Test2_TestMdl1_OCT.txt b/ReferenceFiles/RegressionTests_Test2_TestMdl1_OCT.txt index c78f55f..3f2c9ba 100644 --- a/ReferenceFiles/RegressionTests_Test2_TestMdl1_OCT.txt +++ b/ReferenceFiles/RegressionTests_Test2_TestMdl1_OCT.txt @@ -1,126 +1,40 @@ -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 31( 29 scalars) - Number of Real independent parameters: 12( 10 scalars) - Number of Integer independent parameters: 4( 4 scalars) - Number of Enum independent parameters: 6( 6 scalars) - Number of Boolean independent parameters: 7( 7 scalars) - Number of String independent parameters: 2( 2 scalars) -Number of dependent parameters: 17( 17 scalars) - Number of Real dependent parameters: 12( 12 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 1( 1 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 28( 28 scalars) - Number of Real variables: 28( 28 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 0( 0 scalars) -Number of Real derivative variables: 0( 0 scalars) -Number of Real continous algebraic variables: 24( 24 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 4( 4 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 28( 28 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 28( 28 scalars) -Number of initial equations: 0( 0 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 131( 131 scalars) - Number of Real independent parameters: 37( 37 scalars) - Number of Integer independent parameters: 22( 22 scalars) - Number of Enum independent parameters: 4( 4 scalars) - Number of Boolean independent parameters: 60( 60 scalars) - Number of String independent parameters: 8( 8 scalars) -Number of dependent parameters: 19( 19 scalars) - Number of Real dependent parameters: 14( 14 scalars) - Number of Integer dependent parameters: 1( 1 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 16( 16 scalars) - Number of Real variables: 14( 14 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 2( 2 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 1( 1 scalars) -Number of Real derivative variables: 1( 1 scalars) -Number of Real continous algebraic variables: 8( 8 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 6( 6 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 2( 2 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 17( 15 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 17( 15 scalars) -Number of initial equations: 7( 7 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 +{ + "RegressionTests.Test2.TestMdl1": { + "number_of_equations": 17, + "number_of_event_indicators": 0, + "time_events": true, + "step_events": false, + "states": { + "number_of_states": 1, + "list_of_states": [ + { + "state": "heatCapacitor.T", + "attributes": { + "start": "293.15", + "displayUnit": "\"degC\"" + } + } + ] + }, + "Initialization_System": { + "number_of_blocks": 0, + "blocks": [] + }, + "System": { + "number_of_blocks": 0, + "blocks": [] + }, + "directional_derivatives": { + "compute": false, + "external_functions_no_derivative_annotation": [ + "Modelica.Blocks.Tables.Internal.getTimeTableTmin", + "Modelica.Blocks.Types.ExternalCombiTimeTable.destructor", + "Modelica.Blocks.Tables.Internal.getTimeTableTmax", + "Modelica.Blocks.Types.ExternalCombiTimeTable.constructor", + "Modelica.Utilities.Strings.Advanced.skipWhiteSpace", + "Modelica.Utilities.Strings.length", + "Modelica.Blocks.Tables.Internal.getNextTimeEvent" + ] + } + } +} \ No newline at end of file diff --git a/ReferenceFiles/RegressionTests_Test2_TestMdl2_OCT.txt b/ReferenceFiles/RegressionTests_Test2_TestMdl2_OCT.txt index c78f55f..e958de8 100644 --- a/ReferenceFiles/RegressionTests_Test2_TestMdl2_OCT.txt +++ b/ReferenceFiles/RegressionTests_Test2_TestMdl2_OCT.txt @@ -1,126 +1,40 @@ -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 31( 29 scalars) - Number of Real independent parameters: 12( 10 scalars) - Number of Integer independent parameters: 4( 4 scalars) - Number of Enum independent parameters: 6( 6 scalars) - Number of Boolean independent parameters: 7( 7 scalars) - Number of String independent parameters: 2( 2 scalars) -Number of dependent parameters: 17( 17 scalars) - Number of Real dependent parameters: 12( 12 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 1( 1 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 28( 28 scalars) - Number of Real variables: 28( 28 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 0( 0 scalars) -Number of Real derivative variables: 0( 0 scalars) -Number of Real continous algebraic variables: 24( 24 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 4( 4 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 28( 28 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 28( 28 scalars) -Number of initial equations: 0( 0 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 131( 131 scalars) - Number of Real independent parameters: 37( 37 scalars) - Number of Integer independent parameters: 22( 22 scalars) - Number of Enum independent parameters: 4( 4 scalars) - Number of Boolean independent parameters: 60( 60 scalars) - Number of String independent parameters: 8( 8 scalars) -Number of dependent parameters: 19( 19 scalars) - Number of Real dependent parameters: 14( 14 scalars) - Number of Integer dependent parameters: 1( 1 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 2( 2 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 16( 16 scalars) - Number of Real variables: 14( 14 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 2( 2 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 1( 1 scalars) -Number of Real derivative variables: 1( 1 scalars) -Number of Real continous algebraic variables: 8( 8 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 6( 6 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 2( 2 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 17( 15 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 17( 15 scalars) -Number of initial equations: 7( 7 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 +{ + "RegressionTests.Test2.TestMdl2": { + "number_of_equations": 17, + "number_of_event_indicators": 0, + "time_events": true, + "step_events": false, + "states": { + "number_of_states": 1, + "list_of_states": [ + { + "state": "heatCapacitor.T", + "attributes": { + "start": "293.15", + "displayUnit": "\"degC\"" + } + } + ] + }, + "Initialization_System": { + "number_of_blocks": 0, + "blocks": [] + }, + "System": { + "number_of_blocks": 0, + "blocks": [] + }, + "directional_derivatives": { + "compute": false, + "external_functions_no_derivative_annotation": [ + "Modelica.Blocks.Tables.Internal.getTimeTableTmin", + "Modelica.Blocks.Types.ExternalCombiTimeTable.destructor", + "Modelica.Blocks.Tables.Internal.getTimeTableTmax", + "Modelica.Blocks.Types.ExternalCombiTimeTable.constructor", + "Modelica.Utilities.Strings.Advanced.skipWhiteSpace", + "Modelica.Utilities.Strings.length", + "Modelica.Blocks.Tables.Internal.getNextTimeEvent" + ] + } + } +} \ No newline at end of file diff --git a/ReferenceFiles/RegressionTests_Test3_TestMdl1_OCT.txt b/ReferenceFiles/RegressionTests_Test3_TestMdl1_OCT.txt index b8932cb..63dc69c 100644 --- a/ReferenceFiles/RegressionTests_Test3_TestMdl1_OCT.txt +++ b/ReferenceFiles/RegressionTests_Test3_TestMdl1_OCT.txt @@ -1,126 +1,40 @@ -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 55( 55 scalars) - Number of Real independent parameters: 34( 34 scalars) - Number of Integer independent parameters: 4( 4 scalars) - Number of Enum independent parameters: 6( 6 scalars) - Number of Boolean independent parameters: 7( 7 scalars) - Number of String independent parameters: 4( 4 scalars) -Number of dependent parameters: 15( 15 scalars) - Number of Real dependent parameters: 12( 12 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 1( 1 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 28( 28 scalars) - Number of Real variables: 28( 28 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 0( 0 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 0( 0 scalars) -Number of Real derivative variables: 0( 0 scalars) -Number of Real continous algebraic variables: 24( 24 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 4( 4 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 0( 0 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 28( 28 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 28( 28 scalars) -Number of initial equations: 0( 0 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 -Number of independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Real independent constants: 0( 0 scalars) - Number of Integer independent constants: 0( 0 scalars) - Number of Enum independent constants: 0( 0 scalars) - Number of Boolean independent constants: 0( 0 scalars) - Number of String independent constants: 0( 0 scalars) -Number of dependent constants: 0( 0 scalars) - Number of Real dependent constants: 0( 0 scalars) - Number of Integer dependent constants: 0( 0 scalars) - Number of Enum dependent constants: 0( 0 scalars) - Number of Boolean dependent constants: 0( 0 scalars) - Number of String dependent constants: 0( 0 scalars) -Number of independent parameters: 157( 157 scalars) - Number of Real independent parameters: 61( 61 scalars) - Number of Integer independent parameters: 22( 22 scalars) - Number of Enum independent parameters: 4( 4 scalars) - Number of Boolean independent parameters: 60( 60 scalars) - Number of String independent parameters: 10( 10 scalars) -Number of dependent parameters: 17( 17 scalars) - Number of Real dependent parameters: 14( 14 scalars) - Number of Integer dependent parameters: 1( 1 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of initial parameters: 0( 0 scalars) - Number of Real dependent parameters: 0( 0 scalars) - Number of Integer dependent parameters: 0( 0 scalars) - Number of Enum dependent parameters: 0( 0 scalars) - Number of Boolean dependent parameters: 0( 0 scalars) - Number of String dependent parameters: 0( 0 scalars) -Number of variables: 16( 16 scalars) - Number of Real variables: 14( 14 scalars) - Number of Integer variables: 0( 0 scalars) - Number of Enum variables: 0( 0 scalars) - Number of Boolean variables: 2( 2 scalars) - Number of String variables: 0( 0 scalars) -Number of Real differentiated variables: 1( 1 scalars) -Number of Real derivative variables: 1( 1 scalars) -Number of Real continous algebraic variables: 8( 8 scalars) -Number of inputs: 0( 0 scalars) - Number of Real inputs: 0( 0 scalars) - Number of Integer inputs: 0( 0 scalars) - Number of Enum inputs: 0( 0 scalars) - Number of Boolean inputs: 0( 0 scalars) - Number of String inputs: 0( 0 scalars) -Number of discrete variables: 6( 6 scalars) - Number of Real discrete variables: 4( 4 scalars) - Number of Integer discrete variables: 0( 0 scalars) - Number of Enum discrete variables: 0( 0 scalars) - Number of Boolean discrete variables: 2( 2 scalars) - Number of String discrete variables: 0( 0 scalars) -Number of equations: 15( 15 scalars) -Number of variables with binding expression: 0( 0 scalars) - Number of Real variables with binding exp: 0( 0 scalars) - Number of Integer variables binding exp: 0( 0 scalars) - Number of Enum variables binding exp: 0( 0 scalars) - Number of Boolean variables binding exp: 0( 0 scalars) - Number of String variables binding exp: 0( 0 scalars) -Total number of equations: 15( 15 scalars) -Number of initial equations: 7( 7 scalars) -Number of event indicators in equations: 2 -Number of event indicators in init equations: 0 +{ + "RegressionTests.Test3.TestMdl1": { + "number_of_equations": 15, + "number_of_event_indicators": 0, + "time_events": true, + "step_events": false, + "states": { + "number_of_states": 1, + "list_of_states": [ + { + "state": "heatCapacitor.T", + "attributes": { + "start": "293.15", + "displayUnit": "\"degC\"" + } + } + ] + }, + "Initialization_System": { + "number_of_blocks": 0, + "blocks": [] + }, + "System": { + "number_of_blocks": 0, + "blocks": [] + }, + "directional_derivatives": { + "compute": false, + "external_functions_no_derivative_annotation": [ + "Modelica.Blocks.Tables.Internal.getTimeTableTmin", + "Modelica.Blocks.Types.ExternalCombiTimeTable.destructor", + "Modelica.Blocks.Tables.Internal.getTimeTableTmax", + "Modelica.Blocks.Types.ExternalCombiTimeTable.constructor", + "Modelica.Utilities.Strings.Advanced.skipWhiteSpace", + "Modelica.Utilities.Strings.length", + "Modelica.Blocks.Tables.Internal.getNextTimeEvent" + ] + } + } +} \ No newline at end of file