From a782678a918801ef5030b51aa44ca8b106a0a9c5 Mon Sep 17 00:00:00 2001
From: LolloBici <lorenzo.amici@skywarder.eu>
Date: Wed, 11 Jun 2025 19:27:21 +0200
Subject: [PATCH] [unit-test-updates] Removed settings as output of
mainSimulator
---
simulator/mainSimulator.m | 2 +-
unitTests/saveTests.m | 6 +-----
unitTests/tests/TestSimulator.m | 13 +++++++------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/simulator/mainSimulator.m b/simulator/mainSimulator.m
index 9ec8e265..fec14574 100644
--- a/simulator/mainSimulator.m
+++ b/simulator/mainSimulator.m
@@ -1,4 +1,4 @@
-function [ascent, descent, settings] = mainSimulator(rocket, wind, environment, settings, options)
+function [ascent, descent] = mainSimulator(rocket, wind, environment, settings, options)
arguments
rocket = [] % Rocket = Rocket.empty
wind = [] % Wind = Wind.empty
diff --git a/unitTests/saveTests.m b/unitTests/saveTests.m
index 1da82a0c..2b6aede1 100644
--- a/unitTests/saveTests.m
+++ b/unitTests/saveTests.m
@@ -24,17 +24,13 @@ Settings.read(settings, options, 'unitTest');
%% CREATING SIMULATOR TESTS
if ~isempty(settings.unitTest.saveTestSimulator)
- simPath = fullfile(fileparts(mfilename('fullpath')),'..', 'simulator', 'simulatorConfig.m');
- simSettings = Settings('ode', simPath);
for k = 1:length(settings.unitTest.saveTestSimulator)
- TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, rocket, wind, environment, simSettings );
+ TestSimulator.saveTest(settings.unitTest.saveTestSimulator{k}, rocket, wind, environment);
end
end
%% TEST APOGEE ANALYSIS
if settings.unitTest.saveTestApogeeAnalysis
- apoPath = fullfile(fileparts(mfilename('fullpath')),'..', 'apogeeAnalysis', 'apogeeAnalysisConfig.m');
- apoSettings = Settings('ode', apoPath);
TestApogeeAnalysis.saveTest(mission);
end
diff --git a/unitTests/tests/TestSimulator.m b/unitTests/tests/TestSimulator.m
index 0072ee26..aa4044a0 100644
--- a/unitTests/tests/TestSimulator.m
+++ b/unitTests/tests/TestSimulator.m
@@ -55,12 +55,15 @@ classdef TestSimulator < matlab.unittest.TestCase
end
methods (Static)
- function saveTest(verifiable, rocket, wind, environment, settings)
+ function saveTest(verifiable, rocket, wind, environment)
Time = tic;
currentPath = fileparts(mfilename('fullpath'));
disp('Started saving simulator tests')
+ simPath = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'simulator', 'simulatorConfig.m');
+ settings = Settings('ode', simPath);
+
if strcmp(verifiable, 'ballistic')
settings.simulator.ballistic = 1;
settings.simulator.parafoil = 0;
@@ -75,17 +78,15 @@ classdef TestSimulator < matlab.unittest.TestCase
% end
% simulator
- [stateA, stateF, settings] = mainSimulator(rocket, wind, environment, settings, 'unitTest', true);
+ [stateA, stateF] = mainSimulator(rocket, wind, environment, settings, 'unitTest', true);
% Save final state
fileName = sprintf("referenceState_%s.mat", verifiable);
folderPath = fullfile(currentPath, '..', 'data', 'testSimulator', verifiable);
filePath = fullfile(folderPath, fileName);
- if ~exist(folderPath, "dir")
- mkdir(folderPath)
- end
-
+ if ~exist(folderPath, "dir"), mkdir(folderPath); end
+
save(filePath,'stateA','stateF', 'settings',...
'rocket', 'environment', 'wind');
--
GitLab