Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Skyward
Matlab dependencies
Common
Commits
8a01f8c3
Commit
8a01f8c3
authored
2 months ago
by
Marco Luigi Gaibotti
Committed by
Marco Luigi Gaibotti
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
[to-struct-updates] Added ovverloads for toStruct in Airbrakes and Wind
parent
2a4d1852
No related branches found
No related tags found
1 merge request
!27
[to-struct-updates] Improved toStruct for classes
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
classes/@Rocket/Rocket.m
+1
-2
1 addition, 2 deletions
classes/@Rocket/Rocket.m
classes/bays/Airbrakes.m
+8
-0
8 additions, 0 deletions
classes/bays/Airbrakes.m
classes/misc/Wind.m
+9
-0
9 additions, 0 deletions
classes/misc/Wind.m
with
18 additions
and
2 deletions
classes/@Rocket/Rocket.m
+
1
−
2
View file @
8a01f8c3
...
...
@@ -136,8 +136,7 @@ classdef Rocket < Config
obj
.
rear
=
Rear
(
mission
,
varsIn
);
obj
.
pitot
=
Pitot
(
mission
,
varsIn
);
paraLoader
=
ParaLoader
(
mission
);
obj
.
parachutes
=
paraLoader
.
parachutes
;
obj
.
parachutes
=
Para
(
mission
);
if
options
.
loadCoefficients
if
obj
.
dynamicDerivatives
...
...
This diff is collapsed.
Click to expand it.
classes/bays/Airbrakes.m
+
8
−
0
View file @
8a01f8c3
...
...
@@ -82,5 +82,13 @@ classdef Airbrakes < Bay
idx
=
sum
(
time
>=
obj
.
time
);
extension
=
obj
.
extension
(
idx
);
end
function
str
=
toStruct
(
obj
)
str
=
toStruct
@
Structured
(
obj
);
% Remove angle function since Simulink does not support
% function handles
str
=
rmfield
(
str
,
{
'angleFunction'
});
end
end
end
\ No newline at end of file
This diff is collapsed.
Click to expand it.
classes/misc/Wind.m
+
9
−
0
View file @
8a01f8c3
...
...
@@ -166,6 +166,15 @@ classdef Wind < Config
% Create gridded interpolant
obj
.
dataInerpolant
=
griddedInterpolant
(
gridVec
,
data
', '
linear
', '
nearest
'
);
end
function
str
=
toStruct
(
obj
)
str
=
toStruct
@
Structured
(
obj
);
% Remove unnecessary fields for class (also unsupported by simulink)
str
=
rmfield
(
str
,
{
...
'magnitudeDistribution'
,
'azimuthDistribution'
,
'elevationDistribution'
,
...
'magnitudeParameters'
,
'azimuthParameters'
,
'elevationParameters'
});
end
end
methods
(
Access
=
private
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment