Skip to content
Snippets Groups Projects
Commit 671b1063 authored by giuliaghirardini's avatar giuliaghirardini
Browse files

[refactoring-ode][functions] Corrected rocket length

parent a8e05f54
Branches
No related tags found
1 merge request!3Refactoring ODE functions
...@@ -83,13 +83,13 @@ switch flag ...@@ -83,13 +83,13 @@ switch flag
if settings.optimization.boatOptimization if settings.optimization.boatOptimization
if settings.optimization.modHaack if settings.optimization.modHaack
Laft = state.Population(1, 8); Laft = state.Population(1, 8);
Lcent = rocket.lengthCenterNoMot*1000 + rocket.rear.boatLength*1000 - Laft; Lcent = rocket.lengthCenter*1000 + rocket.rear.boatLength*1000 - Laft;
else else
Laft = state.Population(1, 6); Laft = state.Population(1, 6);
Lcent = rocket.lengthCenterNoMot*1000 + rocket.rear.boatLength*1000 - Laft; Lcent = rocket.lengthCenter*1000 + rocket.rear.boatLength*1000 - Laft;
end end
else else
Lcent = rocket.lengthCenterNoMot*1000; Lcent = rocket.lengthCenter*1000;
end end
plotCent = plot([Lnos Lnos+Lcent], [r r], 'k'); plotCent = plot([Lnos Lnos+Lcent], [r r], 'k');
set(plotCent,'Tag','gaplotCent'); set(plotCent,'Tag','gaplotCent');
...@@ -198,13 +198,13 @@ switch flag ...@@ -198,13 +198,13 @@ switch flag
if settings.optimization.boatOptimization if settings.optimization.boatOptimization
if settings.optimization.modHaack if settings.optimization.modHaack
Laft = state.Population(i, 8); Laft = state.Population(i, 8);
Lcent = rocket.lengthCenterNoMot*1000 + rocket.rear.boatLength*1000 - Laft; Lcent = rocket.lengthCenter*1000 + rocket.rear.boatLength*1000 - Laft;
else else
Laft = state.Population(i, 6); Laft = state.Population(i, 6);
Lcent = rocket.lengthCenterNoMot*1000 + rocket.rear.boatLength*1000 - Laft; Lcent = rocket.lengthCenter*1000 + rocket.rear.boatLength*1000 - Laft;
end end
else else
Lcent = rocket.lengthCenterNoMot*1000; Lcent = rocket.lengthCenter*1000;
end end
h = findobj(get(gca,'Children'),'Tag','gaplotCent'); h = findobj(get(gca,'Children'),'Tag','gaplotCent');
set(h,'Xdata',[Lnos Lnos+Lcent]); set(h,'Xdata',[Lnos Lnos+Lcent]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment