From 7695e37d41029526229933a9d6df80a57ebcab7c Mon Sep 17 00:00:00 2001 From: Thabo Krick Date: Tue, 15 Oct 2024 15:35:37 +0200 Subject: [PATCH] Adapted model and tests to october-release baseline --- model/avg_speed.epx | 10 +- model/avg_speed.slx | Bin 130793 -> 140172 bytes .../requirements/avgspeed.polarion.json | 42 +-- .../testcases/AvgSpeed.tc.json | 7 +- .../testcases/ExtremeDeviation.tc.json | 260 ++++++++++++++++++ .../ExtremeDeviation.ui_settings.tc.json | 11 + .../testcases/rbtFolders.json | 2 +- 7 files changed, 308 insertions(+), 24 deletions(-) create mode 100644 model/avg_speed_btcdata/testcases/ExtremeDeviation.tc.json create mode 100644 model/avg_speed_btcdata/testcases/ExtremeDeviation.ui_settings.tc.json diff --git a/model/avg_speed.epx b/model/avg_speed.epx index 36b1047..9507e2a 100644 --- a/model/avg_speed.epx +++ b/model/avg_speed.epx @@ -4,14 +4,14 @@ "Creator" : "developer", "Creation Date" : "10 Oct 2024, 11:52", "Modifier" : "developer", - "Modification Date" : "11 Oct 2024, 12:07", + "Modification Date" : "15 Oct 2024, 15:34", "OS" : "Windows", "Path" : "file:/E:/work/git-based-reference-workflow/model/avg_speed.epx" }, "Architectures" : { "Simulink" : { "Creator" : "developer", - "Import Date" : "11/10/2024 12:02", + "Import Date" : "15/10/2024 13:08", "Matlab Version" : "Matlab 23.2 (R2023b)", "Simulink Version" : "Simulink 23.2 (R2023b)", "Model Creation Date" : "07/10/2024 11:16", @@ -27,9 +27,9 @@ }, "Requirements Sources" : { "avgspeed" : { - "Baseline Name" : "september-release", + "Baseline Name" : "october-release", "Project URL" : "http://polarion03.prom.local/polarion/redirect/project/avgspeed", - "Baseline Revision" : "299677" + "Baseline Revision" : "299694" } }, "constants" : { @@ -37,4 +37,4 @@ "Infinity" : "Infinity", "NaN" : "NaN" } -} +} \ No newline at end of file diff --git a/model/avg_speed.slx b/model/avg_speed.slx index c5462f994fc5ffbe1f0724c1b2b7b42ecee0ff46..1d5931415cb275cc3d0af9c8ed366e6917bbf1ab 100644 GIT binary patch delta 5022 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 delta 1616 zcma)6Yfw{H5WaUqfIt!g0fCTr6e+cEZxZrQ5JesnMnG!SDxhM~sX>E^pq)|CR;5}M zPp^$orNtyOD9#5(o{>rCyh-kGy!&$r+1*}Zdi*PV3l zdF@uO;+9u;QeCTn%GGJM%FF~aGqJ68RsLxR zny?@z&yuB-Cuh!`8Kr!88gGh?Qqo!)rFsPkX-Y>8lWUBOpeX|*8T=_F2A$S6FS3k8 zA)|t9RCFN+Z8W8$<-tnO=+U{*Kr}MJ6-_b?LLKo#ZNkJZU~8Ol7*}6J1+r0h5+Bv& z1f$U8$oDOvH=?Q>HPBj=DH5XAd2S?)6bTaBxs6)CPWwb=r%x8}GcHNLpqs>wtnH&}7N0ZR z6W{uJ$F^SsYsO?v)7?@S(J9S(-=yfRn|hjN$NTPl<(lu;8tf_iDt_`1+pDWB^764F zg{`q%79uL;}D zVll9<{dtiyAHA_^+4*UH^&(^_kr&urrusXi<-gQ91QH+X@=X)(%|cc9lJZde8m}WE zsh_d}hp$L*lzYu;%sM}O@xp^H{tKR%7OE>9>M_>@iK`oM+Swyss>~Vl=T;0-jJ)BB zW0tMub$Bbr?@_o9`LeYnb4vb(-3^~K+J-IKyPIb{Hg37AFml(JwJnn?3deK&3r1X> zQN-`q-{O9`WJ6?s^LBpW(I?d2rqXS00w6zbiFKtucM0>eu-<{5<+bW&dxtW<=Lo?iQ@vxiF5S62|X3 zR9`nb=vdpxeZN~z%90=MTa-9PTX=d~_0zuX@l$4>opZ3Damf?54R4m_yVT4KA8K#n zl4nSgwioir+zzjgM_lL*2qB1pMG!bc1%W7TNr*l1Fw0PdD$KWPBoTh9CYU3Z4%Inog?5lgI6%-4+a?Tm^bI)Dk;dFvmpW= z%y%9pK<|RLV1NuH;(;b}hGh{%(0jgpxj0n@2~eGfnsE>|%fJ^qWK7bv`3w+(d2$Ga zvPDiKI$r99%akBMJImfC`ZiMaVq7GL81OreFUTPd^zB%rfCSd}-2~23K*+#D#2Xbb z$ffZiL7*F6fjCwK0=zSpd@qg)KW6+~PK1*LuJ0uM-?H?b@3FM4c&QTNS-dt9%Wji$ qd|%0A*l`N`s31)Ip9lU=sm|@i8Jw;HC0{~Fhz;%p5!dVdAAbX|)hs>$ diff --git a/model/avg_speed_btcdata/requirements/avgspeed.polarion.json b/model/avg_speed_btcdata/requirements/avgspeed.polarion.json index 2a68050..cbc2238 100644 --- a/model/avg_speed_btcdata/requirements/avgspeed.polarion.json +++ b/model/avg_speed_btcdata/requirements/avgspeed.polarion.json @@ -3,7 +3,7 @@ "kind":"Polarion", "name":"avgspeed", "externalUUID":"UUID http://polarion03.prom.local/polarion/redirect/project/avgspeed", - "lastImportDate":"11 Oct 2024, 12:07", + "lastImportDate":"15 Oct 2024, 15:24", "additionalAttributes":[ ] }, "requirements":[ { @@ -13,9 +13,9 @@ "name":"1 - Core Functionality", "description":"", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-89", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-89&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-89&revision=299694", "parent":"", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] }, { @@ -23,19 +23,19 @@ "name":"1.2 - Overspeed Warning", "description":"The component shall issue an overspeed warning if the speed is above 180km/h", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-92", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-92&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-92&revision=299694", "parent":"AVG-89", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] }, { "identifier":"AVG-91", "name":"1.1 - Average Speed", - "description":"The component shall calculate the average speed of the four wheels", + "description":"The component shall calculate the average speed of the four wheels, including standstill and backwards movement (negative speeds)", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-91", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-91&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-91&revision=299694", "parent":"AVG-89", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] }, { @@ -43,9 +43,9 @@ "name":"2 - Deviating Wheel Speeds", "description":"", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-90", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-90&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-90&revision=299694", "parent":"", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] }, { @@ -53,9 +53,9 @@ "name":"2.2 - Wheel Speed Below Average", "description":"The component shall indicate how much slower than the average speed the slowest wheel is (as negative percentage)", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-94", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-94&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-94&revision=299694", "parent":"AVG-90", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] }, { @@ -63,9 +63,19 @@ "name":"2.1 - Wheel Speed Above Average", "description":"The component shall indicate how much faster than the average speed the fastest wheel is (as positive percentage)", "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-93", - "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-93&revision=299677", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-93&revision=299694", "parent":"AVG-90", - "lastUpdated":"11 Oct 2024, 12:07", + "lastUpdated":"15 Oct 2024, 15:24", + "deleted":"false", + "additionalAttributes":[ ] + }, { + "identifier":"AVG-95", + "name":"2.3 - Extreme Deviation Warning", + "description":"The component shall issue a warning if any wheel speed deviates more than 25% from the average speed and the average speed is above 30km/h", + "externalUUID":"subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-95", + "url":"http://polarion03.prom.local/polarion/redirect/project/avgspeed/workitem?id=AVG-95&revision=299694", + "parent":"AVG-90", + "lastUpdated":"15 Oct 2024, 15:24", "deleted":"false", "additionalAttributes":[ ] } ] @@ -97,9 +107,9 @@ "value":"Requirement" }, { "key":"Baseline Name", - "value":"september-release" + "value":"october-release" }, { "key":"Baseline Revision", - "value":"299677" + "value":"299694" } ] } \ No newline at end of file diff --git a/model/avg_speed_btcdata/testcases/AvgSpeed.tc.json b/model/avg_speed_btcdata/testcases/AvgSpeed.tc.json index f3c0614..0fc947e 100644 --- a/model/avg_speed_btcdata/testcases/AvgSpeed.tc.json +++ b/model/avg_speed_btcdata/testcases/AvgSpeed.tc.json @@ -12,6 +12,7 @@ "steps":[ { "step":{ "number":"0", + "comment":"standstill", "outputs":[ { "fAvgSpeed":"af((fWheelSpeedFL+fWheelSpeedFR+fWheelSpeedRL+fWheelSpeedRR) / 4, 501)" } ] @@ -31,11 +32,13 @@ } }, { "step":{ - "number":"150" + "number":"150", + "comment":"forwards movement" } }, { "step":{ - "number":"308" + "number":"308", + "comment":"backwards movement" } }, { "step":{ diff --git a/model/avg_speed_btcdata/testcases/ExtremeDeviation.tc.json b/model/avg_speed_btcdata/testcases/ExtremeDeviation.tc.json new file mode 100644 index 0000000..8804395 --- /dev/null +++ b/model/avg_speed_btcdata/testcases/ExtremeDeviation.tc.json @@ -0,0 +1,260 @@ +{ + "version":"1.1", + "metaData":{ + "name":"ExtremeDeviation", + "scopePath":"", + "architecture":"avg_speed", + "length":"31", + "draft":"false" + }, + "vectorContent":{ + "steps":[ { + "step":{ + "number":"0", + "comment":"low speed", + "inputs":[ { + "fWheelSpeedFL":"3" + }, { + "fWheelSpeedFR":"1" + }, { + "fWheelSpeedRL":"1" + }, { + "fWheelSpeedRR":"1" + } ], + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"1", + "comment":"no deviation", + "inputs":[ { + "fWheelSpeedFL":"50" + }, { + "fWheelSpeedFR":"50" + }, { + "fWheelSpeedRL":"50" + }, { + "fWheelSpeedRR":"50" + } ], + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"2", + "inputs":[ { + "fWheelSpeedFL":"sg(Ramp, 29, Simulink, false, true, m=1, Starting value=51, End value=)" + } ], + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"3", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"4", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"5", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"6", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"7", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"8", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"9", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"10", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"11", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"12", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"13", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"14", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"15", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"16", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"17", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"18", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"19", + "comment":"acceptable deviation", + "outputs":[ { + "bExtremeDeviation":"0" + } ] + } + }, { + "step":{ + "number":"20", + "comment":"extreme deviation from here on", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"21", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"22", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"23", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"24", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"25", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"26", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"27", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"28", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"29", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + }, { + "step":{ + "number":"30", + "outputs":[ { + "bExtremeDeviation":"1" + } ] + } + } ] + }, + "requirements":[ "subterra:data-service:objects:/default/avgspeed${WorkItem}AVG-95" ], + "interface":{ + "inputs":[ "fWheelSpeedFL", "fWheelSpeedFR", "fWheelSpeedRL", "fWheelSpeedRR" ], + "outputs":[ "bExtremeDeviation", "bOverspeedWarning" ] + } +} \ No newline at end of file diff --git a/model/avg_speed_btcdata/testcases/ExtremeDeviation.ui_settings.tc.json b/model/avg_speed_btcdata/testcases/ExtremeDeviation.ui_settings.tc.json new file mode 100644 index 0000000..42cc333 --- /dev/null +++ b/model/avg_speed_btcdata/testcases/ExtremeDeviation.ui_settings.tc.json @@ -0,0 +1,11 @@ +{ + "version":"1.0", + "configuration":{ + "signals":{ + "outputs":[ { + "name":"bOverspeedWarning", + "visible":false + } ] + } + } +} \ No newline at end of file diff --git a/model/avg_speed_btcdata/testcases/rbtFolders.json b/model/avg_speed_btcdata/testcases/rbtFolders.json index ee01c4e..28e5645 100644 --- a/model/avg_speed_btcdata/testcases/rbtFolders.json +++ b/model/avg_speed_btcdata/testcases/rbtFolders.json @@ -1,5 +1,5 @@ { "Default Test Cases" : { - "avg_speed" : [ "AvgSpeed", "OverspeedWarning", "WheelSpeedDeviationRatio_fast", "WheelSpeedDeviationRatio_slow" ] + "avg_speed" : [ "AvgSpeed", "OverspeedWarning", "WheelSpeedDeviationRatio_fast", "WheelSpeedDeviationRatio_slow", "ExtremeDeviation" ] } } \ No newline at end of file