Merge branch 'dev' into pr/756

Author: wahln

matRad/optimization/+DoseObjectives/matRad_MeanDose.m

@@ -110,15 +110,15 @@
 
     methods (Access = protected)
         function fDose = objectiveQuadraticDiff(obj,dose)
-            fDose = (mean(dose(:)) - obj.parameters{1})^2;
+            fDose = (sum(dose(:))/numel(dose) - obj.parameters{1})^2;
         end
 
         function fDoseGrad = gradientQuadraticDiff(obj,dose)
-            fDoseGrad = 2*(mean(dose(:))-obj.parameters{1}) * ones(size(dose(:)))/numel(dose);
+            fDoseGrad = 2*(sum(dose(:))/numel(dose)-obj.parameters{1}) * ones(size(dose(:)))/numel(dose);
         end
 
         function fDose = objectiveLinearDiff(obj,dose)
-            fDose = abs(mean(dose(:)) - obj.parameters{1});
+            fDose = abs(sum(dose(:))/numel(dose) - obj.parameters{1});
         end
 
         function fDoseGrad = gradientLinearDiff(obj,dose)

test/doseObjectives/test_doseObejctiveEUD.m

@@ -27,7 +27,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -42,6 +42,6 @@
     expected_fDose = [ 18.3392   19.3395   20.0064   20.6733   21.6736]'; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     assertExceptionThrown(@()computeDoseObjectiveGradient(obj,dose),'matRad:Error')
 

test/doseObjectives/test_doseObejctiveMaxDVH.m

@@ -36,7 +36,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -51,7 +51,7 @@
     expected_fDose = [ 2 0 0 0 0]'; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));

test/doseObjectives/test_doseObejctiveMeanDose.m

@@ -41,7 +41,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -63,7 +63,7 @@
     expected_fDose = [24; 24; 24; 24; 24]; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));

test/doseObjectives/test_doseObejctiveMinDVH.m

@@ -36,7 +36,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -51,7 +51,7 @@
     expected_fDose = [ -2.0000 -0.8000 0 0 0]'; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));

test/doseObjectives/test_doseObejctiveSquaredDeviation.m

@@ -26,7 +26,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -41,7 +41,7 @@
     expected_fDose = [-2.0000; -0.8000; 0; 0.8000; 2.0000]; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));

test/doseObjectives/test_doseObejctiveSquaredOverdosing.m

@@ -25,7 +25,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -40,7 +40,7 @@
     expected_fDose = [0         0         0    0.8000    2.0000]'; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));

test/doseObjectives/test_doseObejctiveSquaredUnderdosing.m

@@ -26,7 +26,7 @@
 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveFunction(obj,dose);
 
     assertTrue(isnan(test_fDose));
@@ -41,7 +41,7 @@
     expected_fDose = [ -2.0000 -0.8000 0 0 0]'; 
     assertElementsAlmostEqual(test_fDose,expected_fDose,'absolute', 1e-4);
 
-    dose = [55,58,60,nan,65]';
+    dose = [55,58,60,NaN,65]';
     test_fDose = computeDoseObjectiveGradient(obj,dose);
 
     assertTrue(isnan(test_fDose(4)));