diff --git a/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs b/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs index 8cbfddd8cf7bd5ea32f60fc03a140c158f64e74e..359cb23383f27a3c92138dc7527dae734b823103 100644 --- a/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs +++ b/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs @@ -41,7 +41,11 @@ namespace TUGraz.VectoCore.Models.Declaration { public enum WeightingGroup { - Group4UD = 1, + Group1 = 1, + Group2, + Group3, + + Group4UD, Group4RD, Group4LH, Group5RD, @@ -50,6 +54,11 @@ namespace TUGraz.VectoCore.Models.Declaration Group9LH, Group10RD, Group10LH, + + Group11, + Group12, + Group16, + Unknown } diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs index e9eb84f86ff0a413b8875a406b3b906d77af638c..239b86ff9ac72ae8f3fa6999b32119642ac39652 100644 --- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs +++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs @@ -2109,7 +2109,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration } [ - TestCase(WeightingGroup.Group4UD, 0, 0, 0, 0, 0.5, 0.5), + TestCase(WeightingGroup.Group1,0.1,0.4,0,0,0.15,0.35), + TestCase(WeightingGroup.Group2, 0.06, 0.24, 0.06, 0.14, 0.15, 0.35), + TestCase(WeightingGroup.Group3, 0.1, 0.4, 0, 0, 0.15, 0.35), + + + TestCase(WeightingGroup.Group4UD, 0, 0, 0, 0, 0.5, 0.5), TestCase(WeightingGroup.Group4RD, 0.45, 0.45, 0.05, 0.05, 0, 0), TestCase(WeightingGroup.Group4LH, 0.05, 0.05, 0.45, 0.45, 0, 0), @@ -2121,7 +2126,12 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration TestCase(WeightingGroup.Group10RD, 0.27, 0.63, 0.03, 0.07, 0, 0), TestCase(WeightingGroup.Group10LH, 0.03, 0.07, 0.27, 0.63, 0, 0), - ] + + TestCase(WeightingGroup.Group11, 0.11, 0.25, 0.01, 0.02, 0, 0), + TestCase(WeightingGroup.Group12, 0.03, 0.07, 0.16, 0.36, 0, 0), + TestCase(WeightingGroup.Group16, 0, 0, 0, 0, 0, 0), + + ] public void TestMissionProfileWeights( WeightingGroup group, double eRdLow, double eRdRef, double eLhLow, double eLhRef, double eUdLow, double eUdRef) {