From b02c436d100b4f90174d277bd7edc8a67efdd825 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 8 May 2023 11:23:25 +0200
Subject: [PATCH] adapt reading multiple bus groups for hybrid strategy slope
values
---
.../Models/Declaration/InitEquivalenceFactors.cs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs b/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
index d22131b604..4b180ae1f8 100644
--- a/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
+++ b/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
@@ -220,7 +220,7 @@ namespace TUGraz.VectoCore.Models.Declaration
{
foreach (DataRow row in table.Rows)
{
- var vehicleClass = row.Field<string>("vehiclegroup");
+ var vehicleGroups = row.Field<string>("vehiclegroup");
foreach (DataColumn col in table.Columns)
{
@@ -229,10 +229,12 @@ namespace TUGraz.VectoCore.Models.Declaration
continue;
}
- var values = SplitStringToDoubleTuple(row.Field<string>(col));
- Data[Tuple.Create(vehicleClass, col.Caption, LoadingType.LowLoading)] = values.Item1;
- Data[Tuple.Create(vehicleClass, col.Caption, LoadingType.ReferenceLoad)] = values.Item2;
- }
+ foreach (var vehicleGroup in vehicleGroups.Split('/')) {
+ var values = SplitStringToDoubleTuple(row.Field<string>(col));
+ Data[Tuple.Create(vehicleGroup.Trim(), col.Caption, LoadingType.LowLoading)] = values.Item1;
+ Data[Tuple.Create(vehicleGroup.Trim(), col.Caption, LoadingType.ReferenceLoad)] = values.Item2;
+ }
+ }
}
}
--
GitLab