Merge branch 'dev' into rc/v3.2.0

Author: wahln

matRad/scenarios/matRad_ImportanceScenarios.m

@@ -59,7 +59,7 @@
                 matRad_cfg = MatRad_Config.instance();
                 matRad_cfg.dispError('Invalid number of setup grid points, needs to be a positive scalar!');
             end
-            this.numOfSetupGridPoints = inumGridPoints;
+            this.numOfSetupGridPoints = numGridPoints;
             this.updateScenarios();
         end
 
@@ -69,7 +69,7 @@
                 matRad_cfg = MatRad_Config.instance();
                 matRad_cfg.dispError('Invalid number of range grid points, needs to be a positive scalar!');
             end
-            this.numOfRAngeGridPoints = inumGridPoints;
+            this.numOfRangeGridPoints = numGridPoints;
             this.updateScenarios();
         end
     end

test/scenarios/test_importanceScenarios.m

@@ -143,47 +143,58 @@
     end
 
 
-    function test_importanceScenarioCombineRange
+function test_importanceScenarioCombineRange
 
-        model = matRad_ImportanceScenarios();
-    
-        assertExceptionThrown(@() helper_assignmentTest(model,'combineRange','hello'),'matRad:Error');
-        assertTrue(model.combineRange);
-        
-        nRangeScen = model.totNumRangeScen;
-
-        model.combineRange = false;
-        assertFalse(model.combineRange);
-        assertEqual(model.totNumRangeScen,nRangeScen^2);
-        assertEqual(model.totNumScen,model.totNumRangeScen - 1 + model.totNumShiftScen);
-    
-    function test_importanceScenarioShiftCombinations
-    
-        model = matRad_ImportanceScenarios();
-    
-        assertExceptionThrown(@() helper_assignmentTest(model,'combinations','hello'),'matRad:Error');
-        assertEqual(model.combinations,'none');
-    
-        nSetupPoints = model.numOfSetupGridPoints;
-        nRangePoints = model.numOfRangeGridPoints;
+    model = matRad_ImportanceScenarios();
 
-        model.combinations = 'shift';
-        assertEqual(model.combinations,'shift');
-        assertEqual(model.totNumShiftScen,nSetupPoints^3);
-        assertEqual(model.totNumScen,model.totNumRangeScen - 1 + model.totNumShiftScen);
+    assertExceptionThrown(@() helper_assignmentTest(model,'combineRange','hello'),'matRad:Error');
+    assertTrue(model.combineRange);
 
-        model.combinations = 'all';
-        assertEqual(model.combinations,'all');
-        assertEqual(model.totNumShiftScen,nSetupPoints^3);
-        assertEqual(model.totNumRangeScen,nRangePoints);
-        assertEqual(model.totNumScen,model.totNumRangeScen * model.totNumShiftScen);
-    
-        model.combineRange = false;
-        assertEqual(model.totNumShiftScen,nSetupPoints^3);
-        assertEqual(model.totNumRangeScen,nRangePoints^2);
-        assertEqual(model.totNumScen,model.totNumRangeScen * model.totNumShiftScen);
+    nRangeScen = model.totNumRangeScen;
+
+    model.combineRange = false;
+    assertFalse(model.combineRange);
+    assertEqual(model.totNumRangeScen,nRangeScen^2);
+    assertEqual(model.totNumScen,model.totNumRangeScen - 1 + model.totNumShiftScen);
 
-        model.combinations = 'shift';
-        assertEqual(model.totNumShiftScen,nSetupPoints^3);
-        assertEqual(model.totNumRangeScen,nRangePoints^2);
-        assertEqual(model.totNumScen,model.totNumRangeScen + model.totNumShiftScen - 1);
+function test_importanceScenarioShiftCombinations
+
+    model = matRad_ImportanceScenarios();
+
+    assertExceptionThrown(@() helper_assignmentTest(model,'combinations','hello'),'matRad:Error');
+    assertEqual(model.combinations,'none');
+
+    nSetupPoints = model.numOfSetupGridPoints;
+    nRangePoints = model.numOfRangeGridPoints;
+
+    model.combinations = 'shift';
+    assertEqual(model.combinations,'shift');
+    assertEqual(model.totNumShiftScen,nSetupPoints^3);
+    assertEqual(model.totNumScen,model.totNumRangeScen - 1 + model.totNumShiftScen);
+
+    model.combinations = 'all';
+    assertEqual(model.combinations,'all');
+    assertEqual(model.totNumShiftScen,nSetupPoints^3);
+    assertEqual(model.totNumRangeScen,nRangePoints);
+    assertEqual(model.totNumScen,model.totNumRangeScen * model.totNumShiftScen);
+
+    model.combineRange = false;
+    assertEqual(model.totNumShiftScen,nSetupPoints^3);
+    assertEqual(model.totNumRangeScen,nRangePoints^2);
+    assertEqual(model.totNumScen,model.totNumRangeScen * model.totNumShiftScen);
+
+    model.combinations = 'shift';
+    assertEqual(model.totNumShiftScen,nSetupPoints^3);
+    assertEqual(model.totNumRangeScen,nRangePoints^2);
+    assertEqual(model.totNumScen,model.totNumRangeScen + model.totNumShiftScen - 1);
+
+function test_importanceScenariosPropertySetters
+    model = matRad_ImportanceScenarios();
+
+    model.numOfSetupGridPoints = 5;
+    assertEqual(model.numOfSetupGridPoints,5);
+
+    model.numOfRangeGridPoints = 5;
+    assertEqual(model.numOfRangeGridPoints,5);
+
+