Skip to content

Commit bacad19

Browse files
committed
Update PowerSplitHEV_SpeedTracking
1 parent 9976f68 commit bacad19

10 files changed

+482
-56
lines changed

Components/Vehicle1D/Vehicle1DDriveline_refsub.mdl

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.
Binary file not shown.
-497 Bytes
Loading
93 Bytes
Loading
4.6 KB
Loading

HEV/PowerSplitHEV_SpeedTracking/test/PowerSplitHEV_SpeedTracking_UnitTest.m

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -140,20 +140,17 @@ function runLiveScript_basic(~)
140140

141141
% This is the most basic simulation where nothing interesting happens,
142142
% but this ensures that everything in the script works fine.
143-
evalin("base", "PowerSplitHEV_SpeedTracking_testcase_basic");
143+
PowerSplitHEV_SpeedTracking_testcase_basic
144144

145145
close all
146146
bdclose all
147147
end % function
148148

149149
function runLiveScript_highSpeed(~)
150150
%% Check that the script runs without any warnings or errors.
151-
152151
close all
153152
bdclose all
154-
155-
evalin("base", "PowerSplitHEV_SpeedTracking_testcase_highSpeed");
156-
153+
PowerSplitHEV_SpeedTracking_testcase_highSpeed
157154
close all
158155
bdclose all
159156
end % function
@@ -166,42 +163,51 @@ function runLiveScript_Accelerate_Decelerate(~)
166163
close all
167164
bdclose all
168165

169-
evalin("base", "PowerSplitHEV_SpeedTracking_Accelerate_Decelerate");
166+
% If script loads some variables to the base workspace
167+
% (for example by calling a function which explicitly does so with assignin),
168+
% the script must be explicitly evaluated in the base workspace.
169+
evalin("base", "PowerSplitHEV_SpeedTracking_Accelerate_Decelerate")
170170

171171
close all
172172
bdclose all
173173
end % function
174174

175175
function runLiveScript_SimpleDrivePattern(~)
176176
%% Check that the script runs without any warnings or errors.
177-
178177
close all
179178
bdclose all
180179

181-
evalin("base", "PowerSplitHEV_SpeedTracking_SimpleDrivePattern");
180+
% If script loads some variables to the base workspace
181+
% (for example by calling a function which explicitly does so with assignin),
182+
% the script must be explicitly evaluated in the base workspace.
183+
evalin("base", "PowerSplitHEV_SpeedTracking_SimpleDrivePattern")
182184

183185
close all
184186
bdclose all
185187
end % function
186188

187189
function runLiveScript_FTP75(~)
188190
%% Check that the script runs without any warnings or errors.
189-
190191
close all
191192
bdclose all
192193

193-
evalin("base", "PowerSplitHEV_SpeedTracking_FTP75");
194+
% If script loads some variables to the base workspace
195+
% (for example by calling a function which explicitly does so with assignin),
196+
% the script must be explicitly evaluated in the base workspace.
197+
evalin("base", "PowerSplitHEV_SpeedTracking_FTP75")
194198

195199
close all
196200
bdclose all
197201
end % function
198202

199203
function runLiveScript_main_script(~)
200204
%% Check that the script runs without any warnings or errors.
201-
202205
close all
203206
bdclose all
204207

208+
% If script loads some variables to the base workspace
209+
% (for example by calling a function which explicitly does so with assignin),
210+
% the script must be explicitly evaluated in the base workspace.
205211
evalin("base", "PowerSplitHEV_SpeedTracking_main_script")
206212

207213
close all
@@ -216,6 +222,9 @@ function runLiveScript_sweep(~)
216222
close all
217223
bdclose all
218224

225+
% If script loads some variables to the base workspace
226+
% (for example by calling a function which explicitly does so with assignin),
227+
% the script must be explicitly evaluated in the base workspace.
219228
evalin("base", "PowerSplitHEV_SpeedTracking_sweep")
220229

221230
close all

HEV/PowerSplitHEV_SpeedTracking/test/PowerSplitHEV_SpeedTracking_runtests.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
fullfile(TopFolder, "drive_patterns", "PowerSplitHEV_SpeedTracking_Accelerate_Decelerate.mlx"), ...
5656
fullfile(TopFolder, "drive_patterns", "PowerSplitHEV_SpeedTracking_FTP75.mlx"), ...
5757
fullfile(TopFolder, "drive_patterns", "PowerSplitHEV_SpeedTracking_SimpleDrivePattern.mlx"), ...
58+
fullfile(TopFolder, "testcases", "PowerSplitHEV_SpeedTracking_testcase_basic.mlx"), ...
59+
fullfile(TopFolder, "testcases", "PowerSplitHEV_SpeedTracking_testcase_highSpeed.mlx"), ...
5860
fullfile(TopFolder, "utils", "PowerSplitHEV_SpeedTracking_example.m"), ...
5961
fullfile(TopFolder, "utils", "PowerSplitHEV_SpeedTracking_selectInput.m") ], ...
6062
Producing = coverageReport );
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
2+
<testsuites>
3+
<testsuite errors="0" failures="0" name="PowerSplitHEV_SpeedTracking_UnitTest" skipped="0" tests="10" time="303.8667">
4+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="openAndRun_1" time="18.5113"/>
5+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="openAndRun_2_1" time="17.1823"/>
6+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="openAndRun_2_2" time="16.0737"/>
7+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_basic" time="17.0455"/>
8+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_highSpeed" time="22.6963"/>
9+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_Accelerate_Decelerate" time="20.478"/>
10+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_SimpleDrivePattern" time="20.7736"/>
11+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_FTP75" time="78.6244"/>
12+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_main_script" time="14.4742"/>
13+
<testcase classname="PowerSplitHEV_SpeedTracking_UnitTest" name="runLiveScript_sweep" time="78.0074"/>
14+
</testsuite>
15+
</testsuites>

0 commit comments

Comments
 (0)