From 1f8bd3ba4797fa88a0e0bfda4c26b847782b1559 Mon Sep 17 00:00:00 2001
From: Stefan Brandt <brandt@ivt.tugraz.at>
Date: Mon, 5 Aug 2019 10:58:58 +0200
Subject: [PATCH] Added missing weight factors for vehicle groups
1,2,3,11,12,16
---
.../Models/Declaration/WeightingGroups.cs | 11 ++++++++++-
.../Models/Declaration/DeclarationDataTest.cs | 14 ++++++++++++--
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs b/VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
index 8cbfddd8cf..359cb23383 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 e9eb84f86f..239b86ff9a 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)
{
--
GitLab