diff --git a/unitTests/unitTestClasses/TestApogeeAnalysis.m b/unitTests/TestApogeeAnalysis.m
similarity index 100%
rename from unitTests/unitTestClasses/TestApogeeAnalysis.m
rename to unitTests/TestApogeeAnalysis.m
diff --git a/unitTests/unitTestClasses/TestCommonFunctions.m b/unitTests/TestCommonFunctions.m
similarity index 100%
rename from unitTests/unitTestClasses/TestCommonFunctions.m
rename to unitTests/TestCommonFunctions.m
diff --git a/unitTests/unitTestClasses/TestSensitivity.m b/unitTests/TestSensitivity.m
similarity index 100%
rename from unitTests/unitTestClasses/TestSensitivity.m
rename to unitTests/TestSensitivity.m
diff --git a/unitTests/unitTestClasses/TestSimulator.m b/unitTests/TestSimulator.m
similarity index 56%
rename from unitTests/unitTestClasses/TestSimulator.m
rename to unitTests/TestSimulator.m
index d36cb949711c11ebcad4e9ff0cdd6d12164e35da..5a628e0e49e042c99c0ea9245938fbc903ea9871 100644
--- a/unitTests/unitTestClasses/TestSimulator.m
+++ b/unitTests/TestSimulator.m
@@ -4,41 +4,17 @@ classdef TestSimulator < UnitTest
% MANCA refSolid
properties
- simulatorSettings
+ SimulatorSettings Settings % [-]
refSimulator
end
properties (TestParameter)
- verifiable = {'multipleAB', 'ballistic', 'engineCut', 'solid', 'HRE'};
+ verifiable = {'multipleAB', 'ballistic', 'engineCut', 'HRE'};
end
- methods
- function createTest(testCase, verifiable)
- currentPath = fileparts(mfilename('fullpath'));
- addpath(genpath(currentPath));
-
- fileName = sprintf("referenceState_%s.mat", verifiable);
- filePath = fullfile('data', 'testSimulator', verifiable, fileName);
- % Load the reference file
- testCase.rocket = load(filePath, 'rocket').rocket;
- testCase.environment = load(filePath, 'environment').environment;
- testCase.wind = load(filePath, 'wind').wind;
-
- % fieldName = ['referenceState_' verifiable];
- testCase.refSimulator.stateA = load(filePath).stateA;
- testCase.refSimulator.stateF = load(filePath).stateF;
-
- testCase.simulatorSettings = load(filePath).simulatorSettings;
-
- % Construct the file path dynamically based on the test parameter
- end
- end
-
-
-
- methods (Static)
- function saveTest(verifiable, mission)
+ methods
+ function saveTest(testCase, testName, mission)
Time = tic;
disp('Started saving simulator tests')
@@ -51,30 +27,60 @@ classdef TestSimulator < UnitTest
rocket = Rocket(mission);
environment = Environment(mission, rocket.motor);
wind = WindCustom(mission);
-
- % simulator
- [stateA, stateF] = mainSimulator(rocket, wind, environment);
+ mainSimPath = fullfile('..', 'simulator', 'simulatorConfig.m');
+ mainOdePath = fullfile('..', 'common', 'settings', 'odeConfig.m');
+ SimulatorSettings = Settings(mainSimPath, mainOdePath);
+ SimulatorSettings.simulator.SMonly = 0;
+ if strcmp(testName, 'ballistic')
+ SimulatorSettings.simulator.ballistic = 1;
+ SimulatorSettings.simulator.parafoil = 0;
+ end
- configPath = fullfile(currentPath, mainSimPath, 'simulator');
- simulatorSettings = Settings(fullfile(configPath), 'simulator');
+ % simulator
+ [ascent, descent] = mainSimulator(rocket, wind, environment, SimulatorSettings);
+ stateA = ascent(end, :);
+ stateF = descent(end, :);
% Save final state
- fileName = sprintf("referenceState_%s.mat", verifiable);
- folderPath = fullfile(currentPath, 'data', 'testSimulator', verifiable);
+ fileName = sprintf("referenceState_%s.mat", testName);
+ folderPath = fullfile('data', 'testSimulator', testName);
filePath = fullfile(folderPath, fileName);
if ~exist(folderPath, "dir")
mkdir(folderPath)
end
- save(filePath,'stateA','stateF', 'simulatorSettings',...
- 'mission', 'rocket', 'environment', 'wind');
-
- close all;
+ save(filePath,'stateA','stateF', 'SimulatorSettings',...
+ 'mission', 'rocket',...
+ 'environment', 'wind');
Time = toc(Time);
- fprintf('\t %s test created in: %2.2f seconds\n',verifiable, Time)
+ fprintf('\t %s test created in: %2.2f seconds\n',testName, Time)
+
end
+
+ function createTestSimulator(testCase, verifiable)
+
+
+ currentPath = fileparts(mfilename('fullpath'));
+ addpath(currentPath);
+
+ fileName = sprintf("referenceState_%s.mat", verifiable);
+ filePath = fullfile('data', 'testSimulator', verifiable, fileName);
+
+ % Load the reference file
+ testCase.rocket = load(filePath, 'rocket').rocket;
+ testCase.environment = load(filePath, 'environment').environment;
+ testCase.wind = load(filePath, 'wind').wind;
+
+ % fieldName = ['referenceState_' verifiable];
+ testCase.refSimulator = load(filePath, 'stateA', 'stateF');
+ testCase.SimulatorSettings = load(filePath, 'SimulatorSettings').SimulatorSettings;
+
+ % Construct the file path dynamically based on the test parameter
+
+ end
+
end
methods (Test)
@@ -86,9 +92,9 @@ classdef TestSimulator < UnitTest
addpath(genpath(mainSimPath));
% Run main simulator
- [postp.stateA, postp.stateF] = mainSimulator(testCase.rocket, testCase.wind, testCase.environment, testCase.simulatorSettings);
-
- close all;
+ [postp.stateA, postp.stateF] = mainSimulator(testCase.rocket, testCase.wind, testCase.environment, testCase.SimulatorSettings);
+ postp.stateA = postp.stateA(end, :);
+ postp.stateF = postp.stateF(end, :);
% Verify results
testCase.verifyEqual(postp, testCase.refSimulator, 'AbsTol', testCase.absToll, 'RelTol', testCase.relToll);
diff --git a/unitTests/unitTestClasses/UnitTest.m b/unitTests/UnitTest.m
similarity index 100%
rename from unitTests/unitTestClasses/UnitTest.m
rename to unitTests/UnitTest.m
diff --git a/unitTests/unitTestClasses/configUnitTest.m b/unitTests/configUnitTest.m
similarity index 100%
rename from unitTests/unitTestClasses/configUnitTest.m
rename to unitTests/configUnitTest.m
diff --git a/unitTests/unitTestClasses/data/testApogeeAnalysis/engineCutApogee/refEngineCut.mat b/unitTests/data/testApogeeAnalysis/engineCutApogee/refEngineCut.mat
similarity index 100%
rename from unitTests/unitTestClasses/data/testApogeeAnalysis/engineCutApogee/refEngineCut.mat
rename to unitTests/data/testApogeeAnalysis/engineCutApogee/refEngineCut.mat
diff --git a/unitTests/unitTestClasses/data/testApogeeAnalysis/standardApogee/refStandard.mat b/unitTests/data/testApogeeAnalysis/standardApogee/refStandard.mat
similarity index 100%
rename from unitTests/unitTestClasses/data/testApogeeAnalysis/standardApogee/refStandard.mat
rename to unitTests/data/testApogeeAnalysis/standardApogee/refStandard.mat
diff --git a/unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refAngles.mat b/unitTests/data/testCommonFunctions/interpCoeffs/refAngles.mat
similarity index 100%
rename from unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refAngles.mat
rename to unitTests/data/testCommonFunctions/interpCoeffs/refAngles.mat
diff --git a/unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refCoeffsValue.mat b/unitTests/data/testCommonFunctions/interpCoeffs/refCoeffsValue.mat
similarity index 100%
rename from unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refCoeffsValue.mat
rename to unitTests/data/testCommonFunctions/interpCoeffs/refCoeffsValue.mat
diff --git a/unitTests/unitTestClasses/data/testSensitivityAnalysis/refSensitivity.mat b/unitTests/data/testSensitivityAnalysis/refSensitivity.mat
similarity index 100%
rename from unitTests/unitTestClasses/data/testSensitivityAnalysis/refSensitivity.mat
rename to unitTests/data/testSensitivityAnalysis/refSensitivity.mat
diff --git a/unitTests/data/testSimulator/HRE/referenceState_HRE.mat b/unitTests/data/testSimulator/HRE/referenceState_HRE.mat
new file mode 100644
index 0000000000000000000000000000000000000000..9255c4f66ee7bbcbbe47857e2252751643986fa8
--- /dev/null
+++ b/unitTests/data/testSimulator/HRE/referenceState_HRE.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2696a5102cf8171d2aa2f889a95ce9c5fdfac502d865acf5be43db919fd6c200
+size 51442799
diff --git a/unitTests/data/testSimulator/ballistic/referenceState_ballistic.mat b/unitTests/data/testSimulator/ballistic/referenceState_ballistic.mat
new file mode 100644
index 0000000000000000000000000000000000000000..15af0520edcca8a2f4ad59625997aea0fe6a2bba
--- /dev/null
+++ b/unitTests/data/testSimulator/ballistic/referenceState_ballistic.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b82a489c282a3fcf30b5e4ff78fe07216c4e1ed4bcb24b84ffb8ddf7a8f0b7f8
+size 51073079
diff --git a/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat b/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat
new file mode 100644
index 0000000000000000000000000000000000000000..b20853809c81d1c7c37ac298fa10ce1fff721983
--- /dev/null
+++ b/unitTests/data/testSimulator/engineCut/referenceState_engineCut.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdac77ac3b3731765a85ba913bc46a1300de5e737d10b1d47dbf6fe51678a626
+size 51365870
diff --git a/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat b/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat
new file mode 100644
index 0000000000000000000000000000000000000000..e609d3ee2802bddb29c1cb5eab67ef63e2d1bcec
--- /dev/null
+++ b/unitTests/data/testSimulator/multipleAB/referenceState_multipleAB.mat
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d0f9d4689fa88721f6eacf21795d02bd133e117ca1ce9b3df6d46960293a7e8
+size 51421916
diff --git a/unitTests/unitTestClasses/mainUnitTest.m b/unitTests/mainUnitTest.m
similarity index 100%
rename from unitTests/unitTestClasses/mainUnitTest.m
rename to unitTests/mainUnitTest.m
diff --git a/unitTests/unitTestClasses/saveTests.m b/unitTests/saveTests.m
similarity index 100%
rename from unitTests/unitTestClasses/saveTests.m
rename to unitTests/saveTests.m
diff --git a/unitTests/unitTestClasses/README.md b/unitTests/unitTestClasses/README.md
deleted file mode 100644
index 3bfad990a62ab43866ac9b0ae716376cdaf014b6..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Unit Testing Framework for Rocket Simulations
-
-This repository provides a unit testing framework designed to validate key functionalities for some tools of the msa-toolkit.
-It includes various test classes, scripts for configuration and execution, and a `data` folder containing reference data and inputs for the tests.
-
----
-
-## **Folder Structure**
-
-### **Key Components**
-- **`data/`**: Stores all reference data and input files needed for the tests.
-- **Test Classes**: Each class (e.g., `TestCommonFunctions`, `TestSimulator`).
-- **Scripts**:
- - **`mainUnitTest.m`**: Executes the selected tests based on the configuration.
- - **`saveTests.m`**: Saves settings and reference data for future tests.
- - **`configUnitTest.m`**: Allows users to configure which tests to run or save, as well as the mission parameters.
-
----
-
-## **How to Run Tests**
-
-### 1. **Automatic Testing**
-Tests are executed automatically when merging a branch into the `main` branch.
-This ensures all functionalities are validated before the merge.
-
-### 2. **Manual Testing**
-To run tests manually:
-1. **Configure Tests**: Open the `configUnitTest.m` script and specify:
- - The tests to be executed.
- - The mission parameters for the tests.
-2. **Run the Tests**: Execute the `mainUnitTest.m` script:
-
----
-
-## **How to Save Tests**
-
-### 2. **Manual Testing**
-1. **Configure Tests**: Open the `configUnitTest.m` script and specify:
- - The tests to be saved.
- - The mission parameters for the tests.
-2. **Save the Tests**: Execute the `saveTests.m` script:
diff --git a/unitTests/unitTestClasses/data/testCommonFunctions/createDissileInput/refInput.mat b/unitTests/unitTestClasses/data/testCommonFunctions/createDissileInput/refInput.mat
deleted file mode 100644
index 3fd348ff645409a221d50cfa8dc822ae4e749b63..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testCommonFunctions/createDissileInput/refInput.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78751fa078977dcf31f20f4208cd33661834932485747e7901d74965f545c48a
-size 50211135
diff --git a/unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refInterpCoeffs.mat b/unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refInterpCoeffs.mat
deleted file mode 100644
index a34309592e76ac9d6422457c5897d7852842f61e..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testCommonFunctions/interpCoeffs/refInterpCoeffs.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a4c6be7f76a0f3d988a734258b4f4eaa58a4f9b00279630482e7471793621ff
-size 50202726
diff --git a/unitTests/unitTestClasses/data/testCommonFunctions/refInterpCoeffs.mat b/unitTests/unitTestClasses/data/testCommonFunctions/refInterpCoeffs.mat
deleted file mode 100644
index e4f6f0ac0fd6c5f3264c2ff3e51342db4d33e4b9..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testCommonFunctions/refInterpCoeffs.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac059678dbc394536a279f7a26dd5be98899d06e3971aadeb5862c17c5223be4
-size 50202726
diff --git a/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat b/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat
deleted file mode 100644
index 12b1c78d451608f4a83c50d461fefa6255d49eef..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testSimulator/HRE/referenceState_HRE.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64b1a57785c5010effbcd86848c436686ec4f46217dedb8bef14263a28ae9600
-size 51412338
diff --git a/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat b/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat
deleted file mode 100644
index 75f24828a682291b55b4a5ab2a1a2c8385e07d0f..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testSimulator/ballistic/referenceState_ballistic.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa392951ca33d4ab333e03664996c805215c8aa50ea1771b44cbcec97c4fbc5b
-size 51461215
diff --git a/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat b/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat
deleted file mode 100644
index ccc82ffafc86a6e2aee75cfa87e71d0a0cd0dcc0..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testSimulator/engineCut/referenceState_engineCut.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9bf532733ce28926f48eb93aa3f108c35f8672745586cd3004d62b96c4ecc2d
-size 51346297
diff --git a/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat b/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat
deleted file mode 100644
index edcd85c474cf5f355ccdf4fdf59a33a41344bbad..0000000000000000000000000000000000000000
--- a/unitTests/unitTestClasses/data/testSimulator/multipleAB/referenceState_multipleAB.mat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:353e173b54c360b7ae40384cb84823dde1fa20be6f6ab9c4bcb49e24ae553798
-size 51414505
diff --git a/unitTests/artifacts/results.xml b/unitTests/unitTestOld/artifacts/results.xml
similarity index 100%
rename from unitTests/artifacts/results.xml
rename to unitTests/unitTestOld/artifacts/results.xml
diff --git a/unitTests/configUnitTests.m b/unitTests/unitTestOld/configUnitTests.m
similarity index 100%
rename from unitTests/configUnitTests.m
rename to unitTests/unitTestOld/configUnitTests.m
diff --git a/unitTests/createTests.m b/unitTests/unitTestOld/createTests.m
similarity index 100%
rename from unitTests/createTests.m
rename to unitTests/unitTestOld/createTests.m
diff --git a/unitTests/dataOld/HRE_FURIA-EUROC-T04T03.mat b/unitTests/unitTestOld/dataOld/HRE_FURIA-EUROC-T04T03.mat
similarity index 100%
rename from unitTests/dataOld/HRE_FURIA-EUROC-T04T03.mat
rename to unitTests/unitTestOld/dataOld/HRE_FURIA-EUROC-T04T03.mat
diff --git a/unitTests/dataOld/SRM_M1520-BS.mat b/unitTests/unitTestOld/dataOld/SRM_M1520-BS.mat
similarity index 100%
rename from unitTests/dataOld/SRM_M1520-BS.mat
rename to unitTests/unitTestOld/dataOld/SRM_M1520-BS.mat
diff --git a/unitTests/dataOld/geminiData.m b/unitTests/unitTestOld/dataOld/geminiData.m
similarity index 100%
rename from unitTests/dataOld/geminiData.m
rename to unitTests/unitTestOld/dataOld/geminiData.m
diff --git a/unitTests/dataOld/pyxisData.m b/unitTests/unitTestOld/dataOld/pyxisData.m
similarity index 100%
rename from unitTests/dataOld/pyxisData.m
rename to unitTests/unitTestOld/dataOld/pyxisData.m
diff --git a/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/config.m b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/config.m
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/engineCutApogee/config.m
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/config.m
diff --git a/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/dataEC.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/referenceEC.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/engineCutApogee/referenceEngineCut.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/configHYB.m b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/configHYB.m
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/configHYB.m
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/configHYB.m
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/configSLD.m b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/configSLD.m
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/configSLD.m
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/configSLD.m
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/dataHYB.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/dataSOLID.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceHYB.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceSOLID.mat
diff --git a/unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat b/unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat
similarity index 100%
rename from unitTests/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat
rename to unitTests/unitTestOld/dataOld/testApogeeAnalysis/standardApogee/referenceStandard.mat
diff --git a/unitTests/dataOld/testCommonFunctions/createDissileInput/config.m b/unitTests/unitTestOld/dataOld/testCommonFunctions/createDissileInput/config.m
similarity index 100%
rename from unitTests/dataOld/testCommonFunctions/createDissileInput/config.m
rename to unitTests/unitTestOld/dataOld/testCommonFunctions/createDissileInput/config.m
diff --git a/unitTests/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat b/unitTests/unitTestOld/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat
similarity index 100%
rename from unitTests/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat
rename to unitTests/unitTestOld/dataOld/testCommonFunctions/createDissileInput/referenceInputValue.mat
diff --git a/unitTests/dataOld/testCommonFunctions/interpCoeffs/angles.mat b/unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/angles.mat
similarity index 100%
rename from unitTests/dataOld/testCommonFunctions/interpCoeffs/angles.mat
rename to unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/angles.mat
diff --git a/unitTests/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat b/unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat
similarity index 100%
rename from unitTests/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat
rename to unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/coeffsValue.mat
diff --git a/unitTests/dataOld/testCommonFunctions/interpCoeffs/config.m b/unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/config.m
similarity index 100%
rename from unitTests/dataOld/testCommonFunctions/interpCoeffs/config.m
rename to unitTests/unitTestOld/dataOld/testCommonFunctions/interpCoeffs/config.m
diff --git a/unitTests/dataOld/testOptimization/singleGARun/config1.m b/unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config1.m
similarity index 100%
rename from unitTests/dataOld/testOptimization/singleGARun/config1.m
rename to unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config1.m
diff --git a/unitTests/dataOld/testOptimization/singleGARun/config2.m b/unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config2.m
similarity index 100%
rename from unitTests/dataOld/testOptimization/singleGARun/config2.m
rename to unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config2.m
diff --git a/unitTests/dataOld/testOptimization/singleGARun/config3.m b/unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config3.m
similarity index 100%
rename from unitTests/dataOld/testOptimization/singleGARun/config3.m
rename to unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config3.m
diff --git a/unitTests/dataOld/testOptimization/singleGARun/config4.m b/unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config4.m
similarity index 100%
rename from unitTests/dataOld/testOptimization/singleGARun/config4.m
rename to unitTests/unitTestOld/dataOld/testOptimization/singleGARun/config4.m
diff --git a/unitTests/dataOld/testOptimization/singleGARun/refOptGA.mat b/unitTests/unitTestOld/dataOld/testOptimization/singleGARun/refOptGA.mat
similarity index 100%
rename from unitTests/dataOld/testOptimization/singleGARun/refOptGA.mat
rename to unitTests/unitTestOld/dataOld/testOptimization/singleGARun/refOptGA.mat
diff --git a/unitTests/dataOld/testSensitivityAnalysis/config.m b/unitTests/unitTestOld/dataOld/testSensitivityAnalysis/config.m
similarity index 100%
rename from unitTests/dataOld/testSensitivityAnalysis/config.m
rename to unitTests/unitTestOld/dataOld/testSensitivityAnalysis/config.m
diff --git a/unitTests/dataOld/testSensitivityAnalysis/referenceSensitivity.mat b/unitTests/unitTestOld/dataOld/testSensitivityAnalysis/referenceSensitivity.mat
similarity index 100%
rename from unitTests/dataOld/testSensitivityAnalysis/referenceSensitivity.mat
rename to unitTests/unitTestOld/dataOld/testSensitivityAnalysis/referenceSensitivity.mat
diff --git a/unitTests/dataOld/testSimulator/6DOF/config.m b/unitTests/unitTestOld/dataOld/testSimulator/6DOF/config.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/6DOF/config.m
rename to unitTests/unitTestOld/dataOld/testSimulator/6DOF/config.m
diff --git a/unitTests/dataOld/testSimulator/6DOF/referenceState6DOF.mat b/unitTests/unitTestOld/dataOld/testSimulator/6DOF/referenceState6DOF.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/6DOF/referenceState6DOF.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/6DOF/referenceState6DOF.mat
diff --git a/unitTests/dataOld/testSimulator/ballistic/config.m b/unitTests/unitTestOld/dataOld/testSimulator/ballistic/config.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/ballistic/config.m
rename to unitTests/unitTestOld/dataOld/testSimulator/ballistic/config.m
diff --git a/unitTests/dataOld/testSimulator/ballistic/referenceStateBallistic.mat b/unitTests/unitTestOld/dataOld/testSimulator/ballistic/referenceStateBallistic.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/ballistic/referenceStateBallistic.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/ballistic/referenceStateBallistic.mat
diff --git a/unitTests/dataOld/testSimulator/engineCut/config.m b/unitTests/unitTestOld/dataOld/testSimulator/engineCut/config.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/engineCut/config.m
rename to unitTests/unitTestOld/dataOld/testSimulator/engineCut/config.m
diff --git a/unitTests/dataOld/testSimulator/multiple_AB/config.m b/unitTests/unitTestOld/dataOld/testSimulator/multiple_AB/config.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/multiple_AB/config.m
rename to unitTests/unitTestOld/dataOld/testSimulator/multiple_AB/config.m
diff --git a/unitTests/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat b/unitTests/unitTestOld/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/multiple_AB/referenceState_multipleAB.mat
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/config1.m b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config1.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/config1.m
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config1.m
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/config2.m b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config2.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/config2.m
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config2.m
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/config3.m b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config3.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/config3.m
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/config3.m
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB1.mat
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB2.mat
diff --git a/unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat b/unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_HRE/referenceState_std_HRE_ARB3.mat
diff --git a/unitTests/dataOld/testSimulator/standard_solid/config.m b/unitTests/unitTestOld/dataOld/testSimulator/standard_solid/config.m
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_solid/config.m
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_solid/config.m
diff --git a/unitTests/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat b/unitTests/unitTestOld/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/standard_solid/referenceState_std_solid.mat
diff --git a/unitTests/dataOld/testSimulator/windModels/referenceWindInputComponents.mat b/unitTests/unitTestOld/dataOld/testSimulator/windModels/referenceWindInputComponents.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/windModels/referenceWindInputComponents.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/windModels/referenceWindInputComponents.mat
diff --git a/unitTests/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat b/unitTests/unitTestOld/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/windModels/referenceWindVariableComponents.mat
diff --git a/unitTests/dataOld/testSimulator/windModels/windInputComponents.mat b/unitTests/unitTestOld/dataOld/testSimulator/windModels/windInputComponents.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/windModels/windInputComponents.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/windModels/windInputComponents.mat
diff --git a/unitTests/dataOld/testSimulator/windModels/windVariableComponents.mat b/unitTests/unitTestOld/dataOld/testSimulator/windModels/windVariableComponents.mat
similarity index 100%
rename from unitTests/dataOld/testSimulator/windModels/windVariableComponents.mat
rename to unitTests/unitTestOld/dataOld/testSimulator/windModels/windVariableComponents.mat
diff --git a/unitTests/mainUnitTests.m b/unitTests/unitTestOld/mainUnitTests.m
similarity index 100%
rename from unitTests/mainUnitTests.m
rename to unitTests/unitTestOld/mainUnitTests.m
diff --git a/unitTests/src/apogeeCreateTests.m b/unitTests/unitTestOld/src/apogeeCreateTests.m
similarity index 100%
rename from unitTests/src/apogeeCreateTests.m
rename to unitTests/unitTestOld/src/apogeeCreateTests.m
diff --git a/unitTests/src/cmnFnctnCreateTests.m b/unitTests/unitTestOld/src/cmnFnctnCreateTests.m
similarity index 100%
rename from unitTests/src/cmnFnctnCreateTests.m
rename to unitTests/unitTestOld/src/cmnFnctnCreateTests.m
diff --git a/unitTests/src/optCreateTests.m b/unitTests/unitTestOld/src/optCreateTests.m
similarity index 100%
rename from unitTests/src/optCreateTests.m
rename to unitTests/unitTestOld/src/optCreateTests.m
diff --git a/unitTests/src/sensitivityCreateTests.m b/unitTests/unitTestOld/src/sensitivityCreateTests.m
similarity index 100%
rename from unitTests/src/sensitivityCreateTests.m
rename to unitTests/unitTestOld/src/sensitivityCreateTests.m
diff --git a/unitTests/src/simulatorCreateTests.m b/unitTests/unitTestOld/src/simulatorCreateTests.m
similarity index 100%
rename from unitTests/src/simulatorCreateTests.m
rename to unitTests/unitTestOld/src/simulatorCreateTests.m