From ab5e78fdab8a6365e2cd4fbb5dafe1a8154c2b49 Mon Sep 17 00:00:00 2001
From: Mauco03 <marco.gaibotti@skywarder.eu>
Date: Wed, 12 Feb 2025 21:08:23 +0100
Subject: [PATCH] [handle-value-conversion][Rocket] Fixed coefficients loading
system
---
classes/@Rocket/Rocket.m | 4 ++--
classes/@Rocket/checkGeometry.m | 4 ++--
classes/@Rocket/loadData.m | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/classes/@Rocket/Rocket.m b/classes/@Rocket/Rocket.m
index 1dd3d61..0e4be4a 100644
--- a/classes/@Rocket/Rocket.m
+++ b/classes/@Rocket/Rocket.m
@@ -136,7 +136,7 @@ classdef Rocket < Config
obj.parachutes = paraLoader.parachutes;
if options.loadCoefficients
- obj.loadData();
+ obj = obj.loadData();
answer = '';
if isempty(obj.coefficients) || isempty(obj.coefficientsHighAOA)
answer = questdlg(['Coefficient matrices not found. ' ...
@@ -151,7 +151,7 @@ classdef Rocket < Config
parserPath = fullfile(mission.msaPath, 'autoMatricesProtub');
addpath(genpath(parserPath));
mainAutoMatProtub(obj);
- obj.loadData();
+ obj = obj.loadData();
case 'Cancel'
error('Rocket creation aborted')
otherwise
diff --git a/classes/@Rocket/checkGeometry.m b/classes/@Rocket/checkGeometry.m
index 95ce79c..e61422f 100644
--- a/classes/@Rocket/checkGeometry.m
+++ b/classes/@Rocket/checkGeometry.m
@@ -7,8 +7,8 @@ function checks = checkGeometry(obj)
% - checks (n fields of geometry, 1): boolean value of the geometry checks
xCgRocket = round([ ...
- obj.xCg(1); ...
- obj.xCg(end) ...
+ obj.xcg(1); ...
+ obj.xcg(end) ...
], 3);
xCgTest = round([
diff --git a/classes/@Rocket/loadData.m b/classes/@Rocket/loadData.m
index 78b4e6d..43d054e 100644
--- a/classes/@Rocket/loadData.m
+++ b/classes/@Rocket/loadData.m
@@ -15,6 +15,8 @@ dataCoeffs = load(aeroPath);
dataCoeffsHighAOA = load(aeroHighAOAPath);
if isfield(dataCoeffs, motorName) && isfield(dataCoeffsHighAOA, motorName)
+ obj.coefficients = struct();
+ obj.coefficientsHighAOA = struct();
dataCoeffs = dataCoeffs.(motorName);
dataCoeffsHighAOA = dataCoeffsHighAOA.(motorName);
else
--
GitLab