bugfix for EXTERNAL contours and speedub of jacobian structure for constrained optimization

Author: wahln

matRad/optimization/@matRad_OptimizationProblem/matRad_getConstraintBounds.m

@@ -39,7 +39,7 @@
 for  i = 1:size(cst,1)
 
     % Only take OAR or target VOI.
-    if ~any(cellfun(@isempty,cst{i,4})) && ( isequal(cst{i,3},'OAR') || isequal(cst{i,3},'TARGET') )
+    if ~any(cellfun(@isempty,cst{i,4})) && any(strcmp(cst{i,3},{'OAR','TARGET','EXTERNAL'}))
 
         % loop over the number of constraints for the current VOI
         for j = 1:numel(cst{i,6})

matRad/optimization/@matRad_OptimizationProblem/matRad_getJacobianStructure.m

@@ -32,7 +32,9 @@
 %	
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	
  % Initializes constraints	
-jacobStruct = sparse([]);	
+jacobStruct = sparse([]);
+
+tmp = false(size(dij.physicalDose{1},1),1);
  % compute objective function for every VOI.	
 for i = 1:size(cst,1)	
      % Only take OAR or target VOI.	
@@ -43,12 +45,15 @@
             obj = cst{i,6}{j};	
 
             % only perform computations for constraints	
-              if isa(obj,'DoseConstraints.matRad_DoseConstraint')	
+              if isa(obj,'DoseConstraints.matRad_DoseConstraint')
+              	tmp(:) = false;
+                tmp(cst{i,4}{1}) = true;
 
                 % get the jacobian structure depending on dose	
                 jacobDoseStruct = obj.getDoseConstraintJacobianStructure(numel(cst{i,4}{1}));	
                 nRows = size(jacobDoseStruct,2);	
-                jacobStruct = [jacobStruct; repmat(spones(mean(dij.physicalDose{1}(cst{i,4}{1},:),1)),nRows,1)];	
+                %jacobStruct = [jacobStruct; repmat(spones(mean(dij.physicalDose{1}(cst{i,4}{1},:),1)),nRows,1)];	
+                jacobStruct = [jacobStruct; repmat(spones(double(tmp') * dij.physicalDose{1}),nRows,1)];
 
              end	
          end