Merge pull request #506 from e0404/hotfixes/daoWithConstraints

Fix Direct Aperture Optimization with Constraints

Author: wahln

optimization/@matRad_OptimizationProblemDAO/matRad_constraintFunctions.m

@@ -32,6 +32,10 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+% update apertureInfo, bixel weight vector an mapping of leafes to bixels
+if ~isequal(apertureInfoVec,optiProb.apertureInfo.apertureVector)
+    optiProb.apertureInfo = optiProb.matRad_daoVec2ApertureInfo(optiProb.apertureInfo,apertureInfoVec);
+end
 apertureInfo = optiProb.apertureInfo;
 
 % value of constraints for leaves

optimization/@matRad_OptimizationProblemDAO/matRad_constraintJacobian.m

@@ -30,12 +30,11 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-apertureInfo = optiProb.apertureInfo;
-
-% update apertureInfo if necessary
-if ~isequal(apertureInfoVec,apertureInfo.apertureVector)
-    apertureInfo = optiProb.matRad_daoVec2ApertureInfo(apertureInfo,apertureInfoVec);
+% update apertureInfo, bixel weight vector an mapping of leafes to bixels
+if ~isequal(apertureInfoVec,optiProb.apertureInfo.apertureVector)
+    optiProb.apertureInfo = optiProb.matRad_daoVec2ApertureInfo(optiProb.apertureInfo,apertureInfoVec);
 end
+apertureInfo = optiProb.apertureInfo;
 
 % jacobian of the dao constraints
 

optimization/@matRad_OptimizationProblemDAO/matRad_getJacobianStructure.m

@@ -73,7 +73,7 @@
     end
 
     % second leaves
-    counter = 0;
+    counter = apertureInfo.totalNumOfShapes;
     for i = 1:size(apertureInfo.beam,2)
         for j = 1:apertureInfo.beam(i).numOfShapes
             for k = 1:apertureInfo.beam(i).numOfActiveLeafPairs

optimization/@matRad_OptimizationProblemDAO/matRad_objectiveFunction.m

@@ -1,12 +1,12 @@
-function f = matRad_objectiveFunction(optiProb,apertureInfoVect,dij,cst)
+function f = matRad_objectiveFunction(optiProb,apertureInfoVec,dij,cst)
 % matRad IPOPT callback: objective function for direct aperture optimization
 %
 % call
 %   f = matRad_objectiveFunction(optiProb,apertureInfoVect,dij,cst)  
 %
 % input
 %   optiProb:           option struct defining the type of optimization
-%   apertureInfoVect:   aperture info in form of vector
+%   apertureInfoVec:   aperture info in form of vector
 %   dij:                matRad dij struct as generated by bixel-based dose calculation
 %   cst:                matRad cst struct
 %
@@ -31,10 +31,11 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-apertureInfo = optiProb.apertureInfo;
-
 % update apertureInfo, bixel weight vector an mapping of leafes to bixels
-apertureInfo = optiProb.matRad_daoVec2ApertureInfo(apertureInfo,apertureInfoVect);
+if ~isequal(apertureInfoVec,optiProb.apertureInfo.apertureVector)
+    optiProb.apertureInfo = optiProb.matRad_daoVec2ApertureInfo(optiProb.apertureInfo,apertureInfoVec);
+end
+apertureInfo = optiProb.apertureInfo;
 
 % bixel based objective function calculation
 f = matRad_objectiveFunction@matRad_OptimizationProblem(optiProb,apertureInfo.bixelWeights,dij,cst);

optimization/@matRad_OptimizationProblemDAO/matRad_objectiveGradient.m

@@ -31,12 +31,11 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-apertureInfo = optiProb.apertureInfo;
-
 % update apertureInfo, bixel weight vector an mapping of leafes to bixels
-if ~isequal(apertureInfoVec,apertureInfo.apertureVector)
-    apertureInfo = optiProb.matRad_daoVec2ApertureInfo(apertureInfo,apertureInfoVec);
+if ~isequal(apertureInfoVec,optiProb.apertureInfo.apertureVector)
+    optiProb.apertureInfo = optiProb.matRad_daoVec2ApertureInfo(optiProb.apertureInfo,apertureInfoVec);
 end
+apertureInfo = optiProb.apertureInfo;
 
 % bixel based gradient calculation
 bixelG = matRad_objectiveGradient@matRad_OptimizationProblem(optiProb,apertureInfo.bixelWeights,dij,cst);