From 0f009450d903e2c2e6f8c44cec1db7f49e53f00f Mon Sep 17 00:00:00 2001
From: gabrigghia <gabriele.ghia@skywarder.eu>
Date: Wed, 13 Nov 2024 00:13:37 +0100
Subject: [PATCH] [unit-test][uniteTestClasses] Simulator test working
---
.../engineCut/referenceState_engineCut.mat | 3 -
.../HRE_FURIA-EUROC-T04T03.mat | 0
unitTests/{data => dataOld}/SRM_M1520-BS.mat | 0
unitTests/{data => dataOld}/geminiData.m | 0
unitTests/{data => dataOld}/pyxisData.m | 0
.../engineCutApogee/config.m | 0
.../engineCutApogee/dataEC.mat | 0
.../engineCutApogee/referenceEC.mat | 0
.../engineCutApogee/referenceEngineCut.mat | 0
.../standardApogee/configHYB.m | 0
.../standardApogee/configSLD.m | 0
.../standardApogee/dataHYB.mat | 0
.../standardApogee/dataSOLID.mat | 0
.../standardApogee/referenceHYB.mat | 0
.../standardApogee/referenceSOLID.mat | 0
.../standardApogee/referenceStandard.mat | 0
.../createDissileInput/config.m | 0
.../referenceInputValue.mat | 0
.../interpCoeffs/angles.mat | 0
.../interpCoeffs/coeffsValue.mat | 0
.../testCommonFunctions/interpCoeffs/config.m | 0
.../testOptimization/singleGARun/config1.m | 0
.../testOptimization/singleGARun/config2.m | 0
.../testOptimization/singleGARun/config3.m | 0
.../testOptimization/singleGARun/config4.m | 0
.../testOptimization/singleGARun/refOptGA.mat | 0
.../testSensitivityAnalysis/config.m | 0
.../referenceSensitivity.mat | 0
.../testSimulator/6DOF/config.m | 0
.../testSimulator/6DOF/referenceState6DOF.mat | 0
.../testSimulator/ballistic/config.m | 0
.../ballistic/referenceStateBallistic.mat | 0
.../testSimulator/engineCut/config.m | 0
.../testSimulator/multiple_AB/config.m | 0
.../multiple_AB/referenceState_multipleAB.mat | 0
.../testSimulator/standard_HRE/config1.m | 0
.../testSimulator/standard_HRE/config2.m | 0
.../testSimulator/standard_HRE/config3.m | 0
.../referenceState_std_HRE_ARB1.mat | 0
.../referenceState_std_HRE_ARB2.mat | 0
.../referenceState_std_HRE_ARB3.mat | 0
.../testSimulator/standard_solid/config.m | 0
.../referenceState_std_solid.mat | 0
.../referenceWindInputComponents.mat | 0
.../referenceWindVariableComponents.mat | 0
.../windModels/windInputComponents.mat | 0
.../windModels/windVariableComponents.mat | 0
unitTests/unitTestClasses/TestSimulator.m | 78 +++++++++++--------
unitTests/unitTestClasses/configUnitTest.m | 6 +-
.../testSimulator/HRE/referenceState_HRE.mat | 3 +
.../HRE1/referenceState_HRE1.mat | 3 -
.../ballistic/referenceState_ballistic.mat | 3 +
.../engineCut/referenceState_engineCut.mat | 3 +
.../multipleAB/referenceState_multipleAB.mat | 3 +
unitTests/unitTestClasses/mainUnitTest.m | 6 --
55 files changed, 61 insertions(+), 47 deletions(-)
delete mode 100644 unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat
rename unitTests/{data => dataOld}/HRE_FURIA-EUROC-T04T03.mat (100%)
rename unitTests/{data => dataOld}/SRM_M1520-BS.mat (100%)
rename unitTests/{data => dataOld}/geminiData.m (100%)
rename unitTests/{data => dataOld}/pyxisData.m (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/engineCutApogee/config.m (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/engineCutApogee/dataEC.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/engineCutApogee/referenceEC.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/configHYB.m (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/configSLD.m (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/dataHYB.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/dataSOLID.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/referenceHYB.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/referenceSOLID.mat (100%)
rename unitTests/{data => dataOld}/testApogeeAnalysis/standardApogee/referenceStandard.mat (100%)
rename unitTests/{data => dataOld}/testCommonFunctions/createDissileInput/config.m (100%)
rename unitTests/{data => dataOld}/testCommonFunctions/createDissileInput/referenceInputValue.mat (100%)
rename unitTests/{data => dataOld}/testCommonFunctions/interpCoeffs/angles.mat (100%)
rename unitTests/{data => dataOld}/testCommonFunctions/interpCoeffs/coeffsValue.mat (100%)
rename unitTests/{data => dataOld}/testCommonFunctions/interpCoeffs/config.m (100%)
rename unitTests/{data => dataOld}/testOptimization/singleGARun/config1.m (100%)
rename unitTests/{data => dataOld}/testOptimization/singleGARun/config2.m (100%)
rename unitTests/{data => dataOld}/testOptimization/singleGARun/config3.m (100%)
rename unitTests/{data => dataOld}/testOptimization/singleGARun/config4.m (100%)
rename unitTests/{data => dataOld}/testOptimization/singleGARun/refOptGA.mat (100%)
rename unitTests/{data => dataOld}/testSensitivityAnalysis/config.m (100%)
rename unitTests/{data => dataOld}/testSensitivityAnalysis/referenceSensitivity.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/6DOF/config.m (100%)
rename unitTests/{data => dataOld}/testSimulator/6DOF/referenceState6DOF.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/ballistic/config.m (100%)
rename unitTests/{data => dataOld}/testSimulator/ballistic/referenceStateBallistic.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/engineCut/config.m (100%)
rename unitTests/{data => dataOld}/testSimulator/multiple_AB/config.m (100%)
rename unitTests/{data => dataOld}/testSimulator/multiple_AB/referenceState_multipleAB.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/config1.m (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/config2.m (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/config3.m (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_solid/config.m (100%)
rename unitTests/{data => dataOld}/testSimulator/standard_solid/referenceState_std_solid.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/windModels/referenceWindInputComponents.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/windModels/referenceWindVariableComponents.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/windModels/windInputComponents.mat (100%)
rename unitTests/{data => dataOld}/testSimulator/windModels/windVariableComponents.mat (100%)
create mode 100644 unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat
delete mode 100644 unitTests/unitTestClasses/data/testSimulator/HRE1/referenceState_HRE1.mat
create mode 100644 unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat
create mode 100644 unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat
create mode 100644 unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat
diff --git a/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat b/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat
deleted file mode 100644
index 00d7252f..00000000
--- a/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f169227c910b8f22d0fd3ceff138de655db9ce2346a91e7002cee662a6d8d189
-size 403
diff --git a/unitTests/data/HRE_FURIA-EUROC-T04T03.mat b/unitTests/dataOld/HRE_FURIA-EUROC-T04T03.mat
similarity index 100%
rename from unitTests/data/HRE_FURIA-EUROC-T04T03.mat
rename to unitTests/dataOld/HRE_FURIA-EUROC-T04T03.mat
diff --git a/unitTests/data/SRM_M1520-BS.mat b/unitTests/dataOld/SRM_M1520-BS.mat
similarity index 100%
rename from unitTests/data/SRM_M1520-BS.mat
rename to unitTests/dataOld/SRM_M1520-BS.mat
diff --git a/unitTests/data/geminiData.m b/unitTests/dataOld/geminiData.m
similarity index 100%
rename from unitTests/data/geminiData.m
rename to unitTests/dataOld/geminiData.m
diff --git a/unitTests/data/pyxisData.m b/unitTests/dataOld/pyxisData.m
similarity index 100%
rename from unitTests/data/pyxisData.m
rename to unitTests/dataOld/pyxisData.m
diff --git a/unitTests/data/testApogeeAnalysis/engineCutApogee/config.m b/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/config.m
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/engineCutApogee/config.m
rename to unitTests/dataOld/testApogeeAnalysis/engineCutApogee/config.m
diff --git a/unitTests/data/testApogeeAnalysis/engineCutApogee/dataEC.mat b/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/engineCutApogee/dataEC.mat
rename to unitTests/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat
diff --git a/unitTests/data/testApogeeAnalysis/engineCutApogee/referenceEC.mat b/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/engineCutApogee/referenceEC.mat
rename to unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat
diff --git a/unitTests/data/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat b/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
rename to unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/configHYB.m b/unitTests/dataOld/testApogeeAnalysis/standardApogee/configHYB.m
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/configHYB.m
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/configHYB.m
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/configSLD.m b/unitTests/dataOld/testApogeeAnalysis/standardApogee/configSLD.m
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/configSLD.m
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/configSLD.m
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/dataHYB.mat b/unitTests/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/dataHYB.mat
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/dataSOLID.mat b/unitTests/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/dataSOLID.mat
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/referenceHYB.mat b/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/referenceHYB.mat
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/referenceSOLID.mat b/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/referenceSOLID.mat
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat
diff --git a/unitTests/data/testApogeeAnalysis/standardApogee/referenceStandard.mat b/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat
similarity index 100%
rename from unitTests/data/testApogeeAnalysis/standardApogee/referenceStandard.mat
rename to unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat
diff --git a/unitTests/data/testCommonFunctions/createDissileInput/config.m b/unitTests/dataOld/testCommonFunctions/createDissileInput/config.m
similarity index 100%
rename from unitTests/data/testCommonFunctions/createDissileInput/config.m
rename to unitTests/dataOld/testCommonFunctions/createDissileInput/config.m
diff --git a/unitTests/data/testCommonFunctions/createDissileInput/referenceInputValue.mat b/unitTests/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat
similarity index 100%
rename from unitTests/data/testCommonFunctions/createDissileInput/referenceInputValue.mat
rename to unitTests/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat
diff --git a/unitTests/data/testCommonFunctions/interpCoeffs/angles.mat b/unitTests/dataOld/testCommonFunctions/interpCoeffs/angles.mat
similarity index 100%
rename from unitTests/data/testCommonFunctions/interpCoeffs/angles.mat
rename to unitTests/dataOld/testCommonFunctions/interpCoeffs/angles.mat
diff --git a/unitTests/data/testCommonFunctions/interpCoeffs/coeffsValue.mat b/unitTests/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat
similarity index 100%
rename from unitTests/data/testCommonFunctions/interpCoeffs/coeffsValue.mat
rename to unitTests/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat
diff --git a/unitTests/data/testCommonFunctions/interpCoeffs/config.m b/unitTests/dataOld/testCommonFunctions/interpCoeffs/config.m
similarity index 100%
rename from unitTests/data/testCommonFunctions/interpCoeffs/config.m
rename to unitTests/dataOld/testCommonFunctions/interpCoeffs/config.m
diff --git a/unitTests/data/testOptimization/singleGARun/config1.m b/unitTests/dataOld/testOptimization/singleGARun/config1.m
similarity index 100%
rename from unitTests/data/testOptimization/singleGARun/config1.m
rename to unitTests/dataOld/testOptimization/singleGARun/config1.m
diff --git a/unitTests/data/testOptimization/singleGARun/config2.m b/unitTests/dataOld/testOptimization/singleGARun/config2.m
similarity index 100%
rename from unitTests/data/testOptimization/singleGARun/config2.m
rename to unitTests/dataOld/testOptimization/singleGARun/config2.m
diff --git a/unitTests/data/testOptimization/singleGARun/config3.m b/unitTests/dataOld/testOptimization/singleGARun/config3.m
similarity index 100%
rename from unitTests/data/testOptimization/singleGARun/config3.m
rename to unitTests/dataOld/testOptimization/singleGARun/config3.m
diff --git a/unitTests/data/testOptimization/singleGARun/config4.m b/unitTests/dataOld/testOptimization/singleGARun/config4.m
similarity index 100%
rename from unitTests/data/testOptimization/singleGARun/config4.m
rename to unitTests/dataOld/testOptimization/singleGARun/config4.m
diff --git a/unitTests/data/testOptimization/singleGARun/refOptGA.mat b/unitTests/dataOld/testOptimization/singleGARun/refOptGA.mat
similarity index 100%
rename from unitTests/data/testOptimization/singleGARun/refOptGA.mat
rename to unitTests/dataOld/testOptimization/singleGARun/refOptGA.mat
diff --git a/unitTests/data/testSensitivityAnalysis/config.m b/unitTests/dataOld/testSensitivityAnalysis/config.m
similarity index 100%
rename from unitTests/data/testSensitivityAnalysis/config.m
rename to unitTests/dataOld/testSensitivityAnalysis/config.m
diff --git a/unitTests/data/testSensitivityAnalysis/referenceSensitivity.mat b/unitTests/dataOld/testSensitivityAnalysis/referenceSensitivity.mat
similarity index 100%
rename from unitTests/data/testSensitivityAnalysis/referenceSensitivity.mat
rename to unitTests/dataOld/testSensitivityAnalysis/referenceSensitivity.mat
diff --git a/unitTests/data/testSimulator/6DOF/config.m b/unitTests/dataOld/testSimulator/6DOF/config.m
similarity index 100%
rename from unitTests/data/testSimulator/6DOF/config.m
rename to unitTests/dataOld/testSimulator/6DOF/config.m
diff --git a/unitTests/data/testSimulator/6DOF/referenceState6DOF.mat b/unitTests/dataOld/testSimulator/6DOF/referenceState6DOF.mat
similarity index 100%
rename from unitTests/data/testSimulator/6DOF/referenceState6DOF.mat
rename to unitTests/dataOld/testSimulator/6DOF/referenceState6DOF.mat
diff --git a/unitTests/data/testSimulator/ballistic/config.m b/unitTests/dataOld/testSimulator/ballistic/config.m
similarity index 100%
rename from unitTests/data/testSimulator/ballistic/config.m
rename to unitTests/dataOld/testSimulator/ballistic/config.m
diff --git a/unitTests/data/testSimulator/ballistic/referenceStateBallistic.mat b/unitTests/dataOld/testSimulator/ballistic/referenceStateBallistic.mat
similarity index 100%
rename from unitTests/data/testSimulator/ballistic/referenceStateBallistic.mat
rename to unitTests/dataOld/testSimulator/ballistic/referenceStateBallistic.mat
diff --git a/unitTests/data/testSimulator/engineCut/config.m b/unitTests/dataOld/testSimulator/engineCut/config.m
similarity index 100%
rename from unitTests/data/testSimulator/engineCut/config.m
rename to unitTests/dataOld/testSimulator/engineCut/config.m
diff --git a/unitTests/data/testSimulator/multiple_AB/config.m b/unitTests/dataOld/testSimulator/multiple_AB/config.m
similarity index 100%
rename from unitTests/data/testSimulator/multiple_AB/config.m
rename to unitTests/dataOld/testSimulator/multiple_AB/config.m
diff --git a/unitTests/data/testSimulator/multiple_AB/referenceState_multipleAB.mat b/unitTests/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat
similarity index 100%
rename from unitTests/data/testSimulator/multiple_AB/referenceState_multipleAB.mat
rename to unitTests/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat
diff --git a/unitTests/data/testSimulator/standard_HRE/config1.m b/unitTests/dataOld/testSimulator/standard_HRE/config1.m
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/config1.m
rename to unitTests/dataOld/testSimulator/standard_HRE/config1.m
diff --git a/unitTests/data/testSimulator/standard_HRE/config2.m b/unitTests/dataOld/testSimulator/standard_HRE/config2.m
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/config2.m
rename to unitTests/dataOld/testSimulator/standard_HRE/config2.m
diff --git a/unitTests/data/testSimulator/standard_HRE/config3.m b/unitTests/dataOld/testSimulator/standard_HRE/config3.m
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/config3.m
rename to unitTests/dataOld/testSimulator/standard_HRE/config3.m
diff --git a/unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat b/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
rename to unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
diff --git a/unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat b/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
rename to unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
diff --git a/unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat b/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
similarity index 100%
rename from unitTests/data/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
rename to unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
diff --git a/unitTests/data/testSimulator/standard_solid/config.m b/unitTests/dataOld/testSimulator/standard_solid/config.m
similarity index 100%
rename from unitTests/data/testSimulator/standard_solid/config.m
rename to unitTests/dataOld/testSimulator/standard_solid/config.m
diff --git a/unitTests/data/testSimulator/standard_solid/referenceState_std_solid.mat b/unitTests/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat
similarity index 100%
rename from unitTests/data/testSimulator/standard_solid/referenceState_std_solid.mat
rename to unitTests/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat
diff --git a/unitTests/data/testSimulator/windModels/referenceWindInputComponents.mat b/unitTests/dataOld/testSimulator/windModels/referenceWindInputComponents.mat
similarity index 100%
rename from unitTests/data/testSimulator/windModels/referenceWindInputComponents.mat
rename to unitTests/dataOld/testSimulator/windModels/referenceWindInputComponents.mat
diff --git a/unitTests/data/testSimulator/windModels/referenceWindVariableComponents.mat b/unitTests/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat
similarity index 100%
rename from unitTests/data/testSimulator/windModels/referenceWindVariableComponents.mat
rename to unitTests/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat
diff --git a/unitTests/data/testSimulator/windModels/windInputComponents.mat b/unitTests/dataOld/testSimulator/windModels/windInputComponents.mat
similarity index 100%
rename from unitTests/data/testSimulator/windModels/windInputComponents.mat
rename to unitTests/dataOld/testSimulator/windModels/windInputComponents.mat
diff --git a/unitTests/data/testSimulator/windModels/windVariableComponents.mat b/unitTests/dataOld/testSimulator/windModels/windVariableComponents.mat
similarity index 100%
rename from unitTests/data/testSimulator/windModels/windVariableComponents.mat
rename to unitTests/dataOld/testSimulator/windModels/windVariableComponents.mat
diff --git a/unitTests/unitTestClasses/TestSimulator.m b/unitTests/unitTestClasses/TestSimulator.m
index fe6eb58f..52f8c93b 100644
--- a/unitTests/unitTestClasses/TestSimulator.m
+++ b/unitTests/unitTestClasses/TestSimulator.m
@@ -6,10 +6,44 @@ classdef TestSimulator < UnitTest
end
properties (TestParameter)
- verifiable = {'multipleAB', 'descent6DOF', 'ballistic', 'engineCut', 'solid','HRE1', 'HRE2', 'HRE3'}
+ verifiable = {'multipleAB', 'ballistic', 'engineCut', 'solid','HRE'}
end
methods
+ function saveTest(testCase, verifiable, mission)
+
+
+
+ Time = tic;
+ rocket = Rocket(mission);
+ environment = Environment(mission, rocket.motor);
+ wind = WindCustom(mission);
+
+
+
+ % simulator
+ [ascent, descent, simulatorSettings] = mainSimulator(rocket, wind, environment);
+
+ stateA = ascent(end, :); % state at end of ascent
+ stateF = descent(end, :); % final state, at touchdown
+
+ % saving final state
+ fileName = sprintf("referenceState_%s.mat", verifiable);
+ folderPath = fullfile('data', 'testSimulator', verifiable);
+ filePath = fullfile(folderPath, fileName);
+
+ if ~exist(folderPath, "dir")
+ mkdir(folderPath)
+ end
+ save(filePath,'stateA','stateF', 'simulatorSettings',...
+ 'mission', 'rocket',...
+ 'environment', 'wind');
+
+ Time = toc(Time);
+ fprintf('\t %s test created in: %2.2f seconds\n',verifiable, Time)
+
+ end
+
function values = setVerifiable(testCase, externalValues)
@@ -18,7 +52,7 @@ classdef TestSimulator < UnitTest
% conditions only
if isempty(externalValues)
- values = testCase.generalParams;
+ values = testCase.verifiable;
fprintf('\t testing with general params\n');
else
values = externalValues;
@@ -26,12 +60,10 @@ classdef TestSimulator < UnitTest
end
- end
-
-
- methods (Test)
function createTestSimulator(testCase, verifiable)
+ verifiable = testCase.setVerifiable(verifiable);
+
currentPath = fileparts(mfilename('fullpath'));
addpath(currentPath);
@@ -52,47 +84,29 @@ classdef TestSimulator < UnitTest
end
+ end
-
-
- function saveTest(testCase, verifiable)
- verifiable = testCase.setVerifiable(verifiable);
+
- Time = tic;
-
-
-
- % simulator
- [ascent, descent, simulatorSettings] = mainSimulator();
- stateA = ascent(end, :); % state at end of ascent
- stateF = descent(end, :); % final state, at touchdown
- stateF = [stateF zeros(1, 7)]; % to avoid problems in checkErrorSimulator
-
- % saving final state
- fileName = sprintf("referenceState_%s.mat", verifiable);
- filePath = fullfile('data', 'testSimulator', verifiable, fileName);
- save(filePath,'stateA','stateF', 'simulatorSettings',...
- 'mission', 'rocket',...
- 'environment', 'wind', 'motor');
-
- Time = toc(Time);
- fprintf('\t %s test created in: %2.2f seconds\n',verifiable, Time)
- end
-
+
+ methods (Test)
- function mainSimulator(testCase, verifiable)
+ function mainSimulatorTest(testCase, verifiable)
verifiable = testCase.setVerifiable(verifiable);
testCase.createTestSimulator(verifiable);
mainSimPath = fullfile('..', 'simulator');
addpath(mainSimPath);
+
[postp.stateA, postp.stateF, ~] = mainSimulator(testCase.rocket, testCase.wind, testCase.environment);
+ postp.stateA = postp.stateA(end, :); % state at end of ascent
+ postp.stateF = postp.stateF(end, :);
testCase.verifyEqual(postp, testCase.refSimulator, 'AbsTol', testCase.absToll, ...
'RelTol', testCase.relToll)
diff --git a/unitTests/unitTestClasses/configUnitTest.m b/unitTests/unitTestClasses/configUnitTest.m
index 1eb2b066..2713265a 100644
--- a/unitTests/unitTestClasses/configUnitTest.m
+++ b/unitTests/unitTestClasses/configUnitTest.m
@@ -2,16 +2,16 @@
%% UNIT TESTS TO RUN
% choose which folders to test
-opt.testSimulator = false;
+opt.testSimulator = true;
opt.testCommonFunction = false;
opt.testApogeeAnalysis = false;
opt.testOptimization = false;
opt.testSensitivity = false;
-opt.createTestSimulator
+
%% UNIT TEST TO CREATE
% choose which folders to create data for
-opt.createTestSimulator = false;
+opt.createTestSimulator = true;
opt.createTestCommonFunction = true;
opt.createTestApogeeAnalysis = true;
opt.createTestOptimization = false;
diff --git a/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat b/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat
new file mode 100644
index 00000000..1c4310d9
--- /dev/null
+++ b/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfe2a3dae2e4eb59ec1ff106b40df8197ed5ff6cf4471a57dab2ae8978d96f6c
+size 67486352
diff --git a/unitTests/unitTestClasses/data/testSimulator/HRE1/referenceState_HRE1.mat b/unitTests/unitTestClasses/data/testSimulator/HRE1/referenceState_HRE1.mat
deleted file mode 100644
index 9a212729..00000000
--- a/unitTests/unitTestClasses/data/testSimulator/HRE1/referenceState_HRE1.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ec37c3d791b93846368ee34f7b1b088d69f1ca09b0682d7ab290d8e942d3cf3
-size 50672574
diff --git a/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat b/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat
new file mode 100644
index 00000000..73716da9
--- /dev/null
+++ b/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcdf9f8da6ad8f647f3737db81e11b91d63039a13cc27197491af9dbac4b73ca
+size 67499806
diff --git a/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat b/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat
new file mode 100644
index 00000000..56b75241
--- /dev/null
+++ b/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edc8a840bc0af6915ba8e94ac67f30e45f0e53744a25131fd2491411005a7bfb
+size 67486352
diff --git a/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat b/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat
new file mode 100644
index 00000000..5989730a
--- /dev/null
+++ b/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ec631c8b56cbbaa75ed68a7e488408ebad1c4558a1d4f57ad1c45433b43518a
+size 67486953
diff --git a/unitTests/unitTestClasses/mainUnitTest.m b/unitTests/unitTestClasses/mainUnitTest.m
index a2d199e4..654ca926 100644
--- a/unitTests/unitTestClasses/mainUnitTest.m
+++ b/unitTests/unitTestClasses/mainUnitTest.m
@@ -10,11 +10,6 @@ configUnitTest;
%% TESTS
beginTest = tic;
-if opt.testSimulator
- test = TestSimulator();
- test.createTest;
- simResults = run(test);
-end
if opt.testCommonFunction
test = TestCommonFunctions();
@@ -42,7 +37,6 @@ end
if opt.testSimulator
test = TestSimulator();
- test.createTest;
sensResults = run(test);
end
--
GitLab