LVD:

1) Added bank angle termination condition
2) Added a typical X parameter to the optimization to help with convergence
3) Fixed bug with deleting an event without looking at constraints and the objective function to see if they used that event.
4) Fixed a number of other bugs.

Author: Arrowstar

helper_methods/ksptot_ma/launch_vehicle_designer/classes/@LvdData/LvdData.m

@@ -167,13 +167,13 @@
             coastDurVar.setBndsForVariable(0, 130);
             lvdOptim.vars.addVariable(coastDurVar);
 
-            const1 = GenericMAConstraint('Eccentricity', evt6, 0, 0, struct.empty(1,0), struct.empty(1,0), celBodyData.kerbin);
+            const1 = GenericMAConstraint('Eccentricity', evt5, 0, 0, struct.empty(1,0), struct.empty(1,0), celBodyData.kerbin);
             lvdOptim.constraints.addConstraint(const1);
 
 %             const2 = GenericMAConstraint('Semi-major Axis', evt6, 700, 700, struct.empty(1,0), struct.empty(1,0), celBodyData.kerbin);
 %             lvdOptim.constraints.addConstraint(const2);
 
-            const3 = GenericMAConstraint('Altitude', evt6, 75, realmax, struct.empty(1,0), struct.empty(1,0), celBodyData.kerbin);
+            const3 = GenericMAConstraint('Altitude', evt5, 75, 10000, struct.empty(1,0), struct.empty(1,0), celBodyData.kerbin);
             lvdOptim.constraints.addConstraint(const3);
 
             lvdData.optimizer = lvdOptim;

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/actions/@SetHoldDownClampActiveStateAction/SetHoldDownClampActiveStateAction.m

@@ -0,0 +1,64 @@
+classdef SetHoldDownClampActiveStateAction < AbstractEventAction
+    %SetStageActiveStateAction Summary of this class goes here
+    %   Detailed explanation goes here
+    
+    properties
+        activeStateToSet(1,1) logical = false;
+    end
+    
+    methods
+        function obj = SetHoldDownClampActiveStateAction(activeStateToSet)
+            if(nargin > 0)
+                obj.activeStateToSet = activeStateToSet;
+            end
+            
+            obj.id = rand();
+        end
+        
+        function newStateLogEntry = exectuteAction(obj, stateLogEntry)
+            newStateLogEntry = stateLogEntry.deepCopy();
+            newStateLogEntry.lvState.holdDownEnabled = obj.activeStateToSet;
+        end
+        
+        function initAction(obj, initialStateLogEntry)
+            %nothing
+        end
+        
+        function name = getName(obj)
+            if(obj.activeStateToSet)
+                tf = 'Active';
+            else
+                tf = 'Inactive';
+            end
+            
+            name = sprintf('Set Hold Down Clamp State (%s)', tf);
+        end
+        
+        function tf = usesStage(obj, stage)
+            tf = false;
+        end
+        
+        function tf = usesEngine(obj, engine)
+            tf = false;
+        end
+        
+        function tf = usesTank(obj, tank)
+            tf = false;
+        end
+        
+        function tf = usesEngineToTankConn(obj, engineToTank)
+            tf = false;
+        end
+        
+        function [tf, vars] = hasActiveOptimVar(obj)
+            tf = false;
+            vars = AbstractOptimizationVariable.empty(0,1);
+        end
+    end
+    
+    methods(Static)
+        function addActionTf = openEditActionUI(action, lv)
+            addActionTf = lvd_EditActionSetClampStateGUI(action);
+        end
+    end
+end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/@TerminationConditionEnum/TerminationConditionEnum.m

@@ -3,11 +3,14 @@
     %   Detailed explanation goes here
 
     enumeration
-        Altitude('Altitude','AltitudeTermCondition')
-        TankMass('TankMass','TankMassTermCondition')
-        EventDuration('Event Duration','EventDurationTermCondition');
+        Altitude('Altitude','AltitudeTermCondition');
         AngleOfAttack('Angle of Attack','AngleOfAttackTermCondition');
-        TrueAnomaly('True Anomaly','TrueAnomalyTermCondition')
+        BankAngle('Bank Angle','BankAngleTermCondition');
+        EventDuration('Event Duration','EventDurationTermCondition');
+        TankMass('Tank Mass','TankMassTermCondition');
+        TrueAnomaly('True Anomaly','TrueAnomalyTermCondition');
+        
+        
     end
 
     properties

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@AngleOfAttackTermCondition/AngleOfAttackTermCondition.m

@@ -69,7 +69,7 @@ function initTermCondition(obj, initialStateLogEntry)
 
     methods(Static)
         function termCond = getTermCondForParams(paramValue, stage, tank, engine)
-            termCond = AngleOfAttackTermCondition(deg2rad(paramValue));
+            termCond = AngleOfAttackTermCondition((paramValue));
         end
     end
 

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Events/termConditions/attitude/@BankAngleTermCondition/BankAngleTermCondition.m

@@ -0,0 +1,90 @@
+classdef BankAngleTermCondition < AbstractEventTerminationCondition
+    %BankAngleTermCondition Summary of this class goes here
+    %   Detailed explanation goes here
+    
+    properties
+        steeringModel(1,1) AbstractSteeringModel = RollPitchYawPolySteeringModel.getDefaultSteeringModel();
+        targetBankAngle(1,1) double = 0;
+        bodyInfo KSPTOT_BodyInfo
+    end
+    
+    methods
+        function obj = BankAngleTermCondition(targetBankAngle)
+            obj.targetBankAngle = targetBankAngle;
+        end
+        
+        function evtTermCondFcnHndl = getEventTermCondFuncHandle(obj)
+            evtTermCondFcnHndl = @(t,y) obj.eventTermCond(t,y, obj.targetBankAngle, obj.steeringModel, obj.bodyInfo);
+        end
+        
+        function initTermCondition(obj, initialStateLogEntry)
+            obj.steeringModel = initialStateLogEntry.steeringModel;
+            obj.bodyInfo = initialStateLogEntry.centralBody;
+        end
+        
+        function name = getName(obj)
+            name = sprintf('Bank Angle (%.3f deg)', rad2deg(obj.targetBankAngle));
+        end
+        
+        function params = getTermCondUiStruct(obj)
+            params = struct();
+            
+            params.paramName = 'Target Bank Angle';
+            params.paramUnit = 'deg';
+            params.useParam = 'on';
+            params.useStages = 'off';
+            params.useTanks = 'off';
+            params.useEngines = 'off';
+            
+            params.value = rad2deg(obj.targetBankAngle);
+            params.refStage = LaunchVehicleStage.empty(1,0);
+            params.refTank = LaunchVehicleEngine.empty(1,0);
+            params.refEngine = LaunchVehicleEngine.empty(1,0);
+        end
+        
+        function optVar = getNewOptVar(obj)
+            optVar = BankAngleTermCondOptimizationVariable(obj);
+        end
+        
+        function optVar = getExistingOptVar(obj)
+            optVar = obj.optVar;
+        end
+        
+        function tf = usesStage(obj, stage)
+            tf = false;
+        end
+        
+        function tf = usesEngine(obj, engine)
+            tf = false;
+        end
+        
+        function tf = usesTank(obj, tank)
+            tf = false;
+        end
+        
+        function tf = usesEngineToTankConn(obj, engineToTank)
+            tf = false;
+        end
+    end
+    
+    methods(Static)
+        function termCond = getTermCondForParams(paramValue, stage, tank, engine)
+            termCond = BankAngleTermCondition((paramValue));
+        end
+    end
+    
+    methods(Static, Access=private)
+        function [value,isterminal,direction] = eventTermCond(t,y, targetBankAngle, steeringModel, bodyInfo)
+            ut = t;
+            rVect = y(1:3);
+            vVect = y(4:6);
+            
+            dcm = steeringModel.getBody2InertialDcmAtTime(ut, rVect, vVect, bodyInfo);
+            [bankAng,~,~] = computeAeroAnglesFromBodyAxes(rVect, vVect, dcm(:,1), dcm(:,2), dcm(:,3));
+            
+            value = bankAng - targetBankAngle;
+            isterminal = 1;
+            direction = 0;
+        end
+    end
+end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/ForceModels/@ThrustForceModel/ThrustForceModel.m

@@ -43,14 +43,10 @@
                                 tank = tanks(k);
                                 tankState = tankStates([tankStates.tank] == tank);
 
-                                try
                                 if(tankState.tankMass > 0) %just check to make sure the engine is connected to fuel somewhere
                                     propExistsInATank = true; 
                                     break;
                                 end
-                                catch ME
-                                    a = 1;
-                                end
                             end
 
                             if(propExistsInATank)

helper_methods/ksptot_ma/launch_vehicle_designer/classes/ForceModels/steering/@AbstractAnglePolySteeringModel/AbstractAnglePolySteeringModel.m

@@ -9,11 +9,11 @@
 
         [tf, lb, ub] = getAngleNModelOptVarParams(obj, n)
 
-        function addActionTf = openEditSteeringModelUI(obj, lv)
-            fakeAction = struct();
-            fakeAction.steeringModel = obj;
+        function [addActionTf, steeringModel] = openEditSteeringModelUI(obj, lv)
+            fakeAction = SetSteeringModelAction(obj);
 
             addActionTf = lvd_EditActionSetSteeringModelGUI(fakeAction, lv);
+            steeringModel = fakeAction.steeringModel;
         end
     end
 end

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/@LvdOptimization/LvdOptimization.m

@@ -23,11 +23,12 @@ function optimize(obj, writeOutput)
             objFuncWrapper = @(x) obj.objFcn.evalObjFcn(x);
             x0All = obj.vars.getTotalXVector();
             [lbAll, ubAll] = obj.vars.getTotalBndsVector();
+            typicalX = obj.vars.getTypicalXVector();
             nonlcon = @(x) obj.constraints.evalConstraints(x);
 
             optimAlg = 'interior-point';
             usePara = true;
-            options = optimoptions('fmincon','Algorithm',optimAlg, 'Diagnostics','on', 'Display','iter-detailed','TolFun',1E-10,'TolX',1E-10,'TolCon',1E-10,'ScaleProblem','none','MaxIter',500,'UseParallel',usePara,'OutputFcn',[],'HonorBounds',true,'MaxFunctionEvaluations',3000, 'FunValCheck','on');
+            options = optimoptions('fmincon','Algorithm',optimAlg, 'Diagnostics','on', 'Display','iter-detailed','TolFun',1E-10,'TolX',1E-10,'TolCon',1E-10,'ScaleProblem','obj-and-constr','TypicalX',typicalX,'MaxIter',500,'UseParallel',usePara,'OutputFcn',[],'HonorBounds',true,'MaxFunctionEvaluations',3000, 'FunValCheck','on');
             problem = createOptimProblem('fmincon', 'objective',objFuncWrapper, 'x0', x0All, 'lb', lbAll, 'ub', ubAll, 'nonlcon', nonlcon, 'options', options);
 
             problem.lvdData = obj.lvdData; %need to get lvdData in somehow

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/constraints/@AbstractConstraint/AbstractConstraint.m

@@ -17,6 +17,8 @@
 
         tf = usesEngineToTankConn(obj, engineToTank)
 
+        tf = usesEvent(obj, event);
+        
         name = getName(obj)
 
         addConstraintTf = openEditConstraintUI(obj, lvdData);

helper_methods/ksptot_ma/launch_vehicle_designer/classes/Optimization/constraints/@ConstraintSet/ConstraintSet.m

@@ -117,6 +117,22 @@ function removeConstraint(obj, const)
                 tf = tf || obj.consts(i).usesEngineToTankConn(engineToTank);
             end
         end
+        
+        function removeConstraintsThatUseEvent(obj, event)
+            indsToRemove = [];
+            for(i=1:length(obj.consts))
+                c = obj.consts(i);
+                
+                if(c.usesEvent(event))
+                    indsToRemove(end+1) = i;
+                end
+            end
+            
+            for(i=length(indsToRemove):-1:1)
+                indToRemove = indsToRemove(i);
+                c = obj.consts(indToRemove);
+                obj.removeConstraint(c);
+            end
+        end
     end
-end
-
+end