diff --git a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.dvo b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.dvo index dec045af8af497f3957fb92cfd55fe9779158abe..ee5c7c51fc6632ebda018bfb0c9594e20ee35151 100644 Binary files a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.dvo and b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.dvo differ diff --git a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.mdl b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.mdl index 6beeae7c4432e6278f76f2e456b4a95929f80c0f..e15d858d2f0fcb339b84b823ea0d7e72c79f517b 100644 --- a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.mdl +++ b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_replacement.mdl @@ -100,7 +100,7 @@ Model { $ObjectID 3 $ClassName "Simulink.WindowInfo" IsActive [1] - Location [30.0, 394.0, 980.0, 742.0] + Location [259.0, 505.0, 980.0, 742.0] Object { $PropName "ModelBrowserInfo" $ObjectID 4 @@ -120,11 +120,33 @@ Model { } Array { Type "Simulink.EditorInfo" - Dimension 2 + Dimension 5 Object { $ObjectID 6 IsActive [1] IsTabbed [1] + ViewObjType "SimulinkTopLevel" + LoadSaveID "0" + Extents [864.0, 500.0] + ZoomFactor [4.0983531214094215] + Offset [61.583993720095691, 16.999887858851672] + SceneRectInView [61.583993720095691, 16.999887858851672, 210.81638755980862, 122.00022428229666] + } + Object { + $ObjectID 7 + IsActive [0] + IsTabbed [0] + ViewObjType "SimulinkTopLevel" + LoadSaveID "AHRS_voter_New:0" + Extents [864.0, 500.0] + ZoomFactor [1.219372785123652] + Offset [79.461687499999982, 118.9765625] + SceneRectInView [79.461687499999982, 118.9765625, 708.561, 410.046875] + } + Object { + $ObjectID 8 + IsActive [0] + IsTabbed [0] ViewObjType "SimulinkSubsys" LoadSaveID "1" Extents [864.0, 500.0] @@ -133,21 +155,32 @@ Model { SceneRectInView [103.23728813559319, 21.516949152542367, 523.52542372881362, 302.96610169491527] } Object { - $ObjectID 7 + $ObjectID 9 + IsActive [0] + IsTabbed [0] + ViewObjType "SimulinkSubsys" + LoadSaveID "AHRS_voter_New:409" + Extents [864.0, 500.0] + ZoomFactor [0.6] + Offset [247.5, 320.33333333333331] + SceneRectInView [247.5, 320.33333333333331, 1440.0, 833.33333333333337] + } + Object { + $ObjectID 10 IsActive [0] IsTabbed [0] ViewObjType "SimulinkTopLevel" - LoadSaveID "0" + LoadSaveID "AHRS_voter_Original:0" Extents [864.0, 500.0] - ZoomFactor [4.0983531214094215] - Offset [61.583993720095691, 16.999887858851672] - SceneRectInView [61.583993720095691, 16.999887858851672, 210.81638755980862, 122.00022428229666] + ZoomFactor [1.5727804757305643] + Offset [176.56939834337351, 159.04583960843374] + SceneRectInView [176.56939834337351, 159.04583960843374, 549.345578313253, 317.90832078313252] } PropName "EditorsInfo" } Object { $PropName "DockComponentsInfo" - $ObjectID 8 + $ObjectID 11 $ClassName "Simulink.DockComponentInfo" Type "GLUE2:PropertyInspector" ID "Property Inspector" @@ -175,7 +208,7 @@ Model { } WindowUuid "0b82776b-3568-4091-8b56-551a033ff4d9" } - BDUuid "13cb81dd-c79f-4c03-bf37-3277169262c8" + BDUuid "58ac1754-23c2-46ab-bf8d-27d7f361e814" } HideAutomaticNames on sldv_blockreplacement_configurable_lib "AHRS_voter_Verify_rt_lib" @@ -185,8 +218,8 @@ Model { ModifiedByFormat "%" LastModifiedBy "super" ModifiedDateFormat "%" - LastModifiedDate "Thu Jul 16 13:21:01 2020" - RTWModifiedTimeStamp 516806461 + LastModifiedDate "Fri Jul 17 14:18:32 2020" + RTWModifiedTimeStamp 516896311 ModelVersionFormat "1.%" SampleTimeColors off SampleTimeAnnotations off @@ -245,7 +278,7 @@ Model { TryForcingSFcnDF off Object { $PropName "DataLoggingOverride" - $ObjectID 9 + $ObjectID 12 $ClassName "Simulink.SimulationData.ModelLoggingInfo" model_ "AHRS_voter_Verify_replacement" overrideMode_ [0.0] @@ -290,7 +323,7 @@ Model { Type "Handle" Dimension 1 Simulink.ConfigSet { - $ObjectID 10 + $ObjectID 13 Version "20.0.1" DisabledProps [] Description "" @@ -298,7 +331,7 @@ Model { Type "Handle" Dimension 11 Simulink.SolverCC { - $ObjectID 11 + $ObjectID 14 Version "20.0.1" DisabledProps [] Description "" @@ -341,7 +374,7 @@ Model { ODENIntegrationMethod "ode3" } Simulink.DataIOCC { - $ObjectID 12 + $ObjectID 15 Version "20.0.1" DisabledProps [] Description "" @@ -383,7 +416,7 @@ Model { LoggingIntervals "[-inf, inf]" } Simulink.OptimizationCC { - $ObjectID 13 + $ObjectID 16 Version "20.0.1" DisabledProps [] Description "" @@ -444,7 +477,7 @@ Model { EfficientTunableParamExpr on } Simulink.DebuggingCC { - $ObjectID 14 + $ObjectID 17 Version "20.0.1" DisabledProps [] Description "" @@ -560,7 +593,7 @@ Model { ArithmeticOperatorsInVariantConditions "none" } Simulink.HardwareCC { - $ObjectID 15 + $ObjectID 18 Version "20.0.1" DisabledProps [] Description "" @@ -610,7 +643,7 @@ Model { HardwareBoardFeatureSet "EmbeddedCoderHSP" } Simulink.ModelReferenceCC { - $ObjectID 16 + $ObjectID 19 Version "20.0.1" DisabledProps [] Description "" @@ -630,7 +663,7 @@ Model { SupportModelReferenceSimTargetCustomCode off } Simulink.SFSimCC { - $ObjectID 17 + $ObjectID 20 Version "20.0.1" DisabledProps [] Description "" @@ -665,7 +698,7 @@ Model { } Simulink.RTWCC { $BackupClass "Simulink.RTWCC" - $ObjectID 18 + $ObjectID 21 Version "20.0.1" DisabledProps [] Description "Embedded Coder" @@ -734,7 +767,7 @@ Model { Type "Handle" Dimension 2 Simulink.CodeAppCC { - $ObjectID 19 + $ObjectID 22 Version "20.0.1" DisabledProps [] Description "" @@ -792,7 +825,7 @@ Model { } Simulink.ERTTargetCC { $BackupClass "Simulink.TargetCC" - $ObjectID 20 + $ObjectID 23 Version "20.0.1" DisabledProps [] Description "" @@ -961,7 +994,7 @@ Model { } } SlCovCC.ConfigComp { - $ObjectID 21 + $ObjectID 24 Version "20.0.1" DisabledProps [] Description "Simulink Coverage Configuration Component" @@ -1002,7 +1035,7 @@ Model { CovMcdcMode "Masking" } hdlcoderui.hdlcc { - $ObjectID 22 + $ObjectID 25 Version "20.0.1" DisabledProps [] Description "HDL Coder custom configuration component" @@ -1017,7 +1050,7 @@ Model { HDLCActiveTab "0" } Sldv.ConfigComp { - $ObjectID 23 + $ObjectID 26 Version "20.0.1" DisabledProps [] Description "Design Verifier Custom Configuration Component" @@ -1123,11 +1156,11 @@ Model { } Simulink.ConfigSet { $PropName "ActiveConfigurationSet" - $ObjectID 10 + $ObjectID 13 } Object { $PropName "DataTransfer" - $ObjectID 24 + $ObjectID 27 $ClassName "Simulink.GlobalDataTransfer" DefaultTransitionBetweenSyncTasks "Ensure deterministic transfer (maximum delay)" DefaultTransitionBetweenAsyncTasks "Ensure data integrity only" @@ -1445,7 +1478,7 @@ Model { } System { Name "AHRS_voter_Verify_replacement" - Location [30, 394, 1010, 1136] + Location [259, 505, 1239, 1247] Open off PortBlocksUseCompactNotation off SetExecutionDomain off @@ -1508,7 +1541,7 @@ Model { RequestExecContextInheritance off Object { $PropName "MaskObject" - $ObjectID 25 + $ObjectID 28 $ClassName "Simulink.Mask" Type "VerificationSubsystem" Help "helpview(fullfile(docroot,'toolbox','sldv','sldv.map'),'verificationsubsystem')" @@ -1520,7 +1553,7 @@ Model { } System { Name "Verification Subsystem" - Location [676, 102, 1656, 844] + Location [30, 23, 1010, 765] Open off PortBlocksUseCompactNotation off SetExecutionDomain off @@ -1589,7 +1622,7 @@ Model { ContentPreviewEnabled on Object { $PropName "MaskObject" - $ObjectID 26 + $ObjectID 29 $ClassName "Simulink.Mask" Type "Sldv ModelReference(Model name:AHRS_voter_Original) Replacement" Description "Replacement for the Model Reference block that references the model AHRS_voter_Original. If Mod" @@ -1598,7 +1631,7 @@ Model { Type "Simulink.MaskParameter" Dimension 4 Object { - $ObjectID 27 + $ObjectID 30 Type "edit" Name "ModelName" Prompt "ModelName" @@ -1608,7 +1641,7 @@ Model { Enabled "off" } Object { - $ObjectID 28 + $ObjectID 31 Type "edit" Name "ParameterArgumentNames" Prompt "ParameterArgumentNames" @@ -1618,7 +1651,7 @@ Model { Enabled "off" } Object { - $ObjectID 29 + $ObjectID 32 Type "edit" Name "ParameterArgumentValuesAsString" Prompt "ParameterArgumentValuesAsString" @@ -1628,7 +1661,7 @@ Model { Enabled "off" } Object { - $ObjectID 30 + $ObjectID 33 Type "edit" Name "SimulationMode" Prompt "SimulationMode" @@ -1700,7 +1733,7 @@ Model { ContentPreviewEnabled on Object { $PropName "MaskObject" - $ObjectID 31 + $ObjectID 34 $ClassName "Simulink.Mask" Type "Sldv ModelReference(Model name:AHRS_voter) Replacement" Description "Replacement for the Model Reference block that references the model AHRS_voter. If Model arguments are" @@ -1709,7 +1742,7 @@ Model { Type "Simulink.MaskParameter" Dimension 4 Object { - $ObjectID 32 + $ObjectID 35 Type "edit" Name "ModelName" Prompt "ModelName" @@ -1719,7 +1752,7 @@ Model { Enabled "off" } Object { - $ObjectID 33 + $ObjectID 36 Type "edit" Name "ParameterArgumentNames" Prompt "ParameterArgumentNames" @@ -1729,7 +1762,7 @@ Model { Enabled "off" } Object { - $ObjectID 34 + $ObjectID 37 Type "edit" Name "ParameterArgumentValuesAsString" Prompt "ParameterArgumentValuesAsString" @@ -1739,7 +1772,7 @@ Model { Enabled "off" } Object { - $ObjectID 35 + $ObjectID 38 Type "edit" Name "SimulationMode" Prompt "SimulationMode" @@ -3187,7 +3220,7 @@ Model { ContentPreviewEnabled on Object { $PropName "MaskObject" - $ObjectID 36 + $ObjectID 39 $ClassName "Simulink.Mask" Type "Sldv ModelReference(Model name:AHRS_voter_New) Replacement" Description "Replacement for the Model Reference block that references the model AHRS_voter_New. If Model ar" @@ -3196,7 +3229,7 @@ Model { Type "Simulink.MaskParameter" Dimension 4 Object { - $ObjectID 37 + $ObjectID 40 Type "edit" Name "ModelName" Prompt "ModelName" @@ -3206,7 +3239,7 @@ Model { Enabled "off" } Object { - $ObjectID 38 + $ObjectID 41 Type "edit" Name "ParameterArgumentNames" Prompt "ParameterArgumentNames" @@ -3216,7 +3249,7 @@ Model { Enabled "off" } Object { - $ObjectID 39 + $ObjectID 42 Type "edit" Name "ParameterArgumentValuesAsString" Prompt "ParameterArgumentValuesAsString" @@ -3226,7 +3259,7 @@ Model { Enabled "off" } Object { - $ObjectID 40 + $ObjectID 43 Type "edit" Name "SimulationMode" Prompt "SimulationMode" @@ -3301,7 +3334,7 @@ Model { ContentPreviewEnabled on System { Name "AHRS_voter" - Location [953, 0, 1927, 1047] + Location [30, 23, 1010, 765] Open off PortBlocksUseCompactNotation off SetExecutionDomain off @@ -4357,6 +4390,8 @@ Model { SID "1:90" Position [1370, 700, 1475, 720] ZOrder 75 + OutMin "-180" + OutMax "180" PortDimensions "5" ArgumentName "voted_fb" } diff --git a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_sldvdata.mat b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_sldvdata.mat index 7c310f7f5d9af8f744325ee1af5d3d282b45bd64..ec80549081828cb128a27cac0e104c2f836da56a 100644 Binary files a/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_sldvdata.mat and b/src/verification/sldv_output/AHRS_voter_Verify/AHRS_voter_Verify_sldvdata.mat differ diff --git a/src/verification/sldv_output/AHRS_voter_Verify/Result.PNG b/src/verification/sldv_output/AHRS_voter_Verify/Result.PNG index aafc2cc280f602c8f80c45fe62d62a1ce0babaad..855cd2cc9232f9c341b17e9e607e407a9d56f8f7 100644 Binary files a/src/verification/sldv_output/AHRS_voter_Verify/Result.PNG and b/src/verification/sldv_output/AHRS_voter_Verify/Result.PNG differ diff --git a/src/verification/sldv_output/AHRS_voter_Verify/ps_results.pscp b/src/verification/sldv_output/AHRS_voter_Verify/ps_results.pscp index 4931a9f5aa470c579c7e8efb77c5181ad2886b17..1314a7da4f867c881f2462663be7e4f55cde1846 100644 Binary files a/src/verification/sldv_output/AHRS_voter_Verify/ps_results.pscp and b/src/verification/sldv_output/AHRS_voter_Verify/ps_results.pscp differ diff --git a/src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_16_13_22_1.txt b/src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_17_14_19_25.txt similarity index 78% rename from src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_16_13_22_1.txt rename to src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_17_14_19_25.txt index 21a838901b7909787c46eb5217657b9d0df5d72d..166bff31fccc16329389c29a1e6ff0a77e700d45 100644 --- a/src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_16_13_22_1.txt +++ b/src/verification/sldv_output/AHRS_voter_Verify/sldv_log_2020_7_17_14_19_25.txt @@ -1,15 +1,15 @@ -16-Jul-2020 13:20:56 +17-Jul-2020 14:18:26 Preprocessing model...done Checking compatibility for property proving: model 'AHRS_voter_Verify' Compiling model...done Building model representation...done -16-Jul-2020 13:21:03 +17-Jul-2020 14:18:34 'AHRS_voter_Verify_replacement' is compatible for property proving with Simulink Design Verifier. -Proving properties using model representation from 16-Jul-2020 13:21:03... +Proving properties using model representation from 17-Jul-2020 14:18:34... Running additional analysis to reduce instances of rational approximation... @@ -17,16 +17,16 @@ Running additional analysis to reduce instances of rational approximation... VALID UNDER APPROXIMATION Verification Subsystem/Proof Objective1 Objective: Point([T T T T T]) -Analysis Time = 00:00:35 +Analysis Time = 00:00:33 -16-Jul-2020 13:22:00 +17-Jul-2020 14:19:23 Property proving was stopped. Generating output files: -16-Jul-2020 13:22:01 +17-Jul-2020 14:19:25 Results generation completed. Data file: diff --git a/src/verification/unit/AHRS_voter/AHRS_voter_New.slx b/src/verification/unit/AHRS_voter/AHRS_voter_New.slx index 5c662df724a77bb10fc1d83b1a531381cbcefd51..5a6b482d3e5946d878514d2e5c529ae236bc61f0 100644 Binary files a/src/verification/unit/AHRS_voter/AHRS_voter_New.slx and b/src/verification/unit/AHRS_voter/AHRS_voter_New.slx differ diff --git a/src/verification/unit/Heli_inner_loop_Verify.mdl b/src/verification/unit/Heli_inner_loop_Verify.mdl index 0652aba47c197d66e32bc0f2f2ff37ad32df4b62..e457f0a35319e2938afd4c370faa9215a01a15d2 100644 --- a/src/verification/unit/Heli_inner_loop_Verify.mdl +++ b/src/verification/unit/Heli_inner_loop_Verify.mdl @@ -34,7 +34,7 @@ Model { } NumRootOutports 0 ParameterArgumentNames "" - ComputedModelVersion "1.6" + ComputedModelVersion "1.7" NumModelReferences 2 ModelReference { ModelRefBlockPath "Heli_inner_loop_Verify/Verification Subsystem/Original Model|Heli_inner_loop_Original" @@ -196,9 +196,9 @@ Model { ModifiedByFormat "%" LastModifiedBy "super" ModifiedDateFormat "%" - LastModifiedDate "Thu Jul 16 14:29:43 2020" - RTWModifiedTimeStamp 516810583 - ModelVersionFormat "1.%" + LastModifiedDate "Thu Jul 16 15:44:31 2020" + RTWModifiedTimeStamp 516815069 + ModelVersionFormat "1.%" SampleTimeColors off SampleTimeAnnotations off LibraryLinkDisplay "disabled" @@ -1035,7 +1035,7 @@ Model { Components [] Name "Design Verifier" DVMode "PropertyProving" - DVMaxProcessTime 3600 + DVMaxProcessTime 1000000 DVDisplayUnsatisfiableObjectives off DVAutomaticStubbing on DVUseParallel off