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 c5462f9..1d59314 100644 Binary files a/model/avg_speed.slx and b/model/avg_speed.slx differ 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