From 1f04019b9d7e291001245d0f12fb1f6f9f3683e0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 7 Nov 2022 12:15:42 +0100
Subject: [PATCH] correcting mapping of hvac configurations
---
.../VectoCore/Models/Declaration/DeclarationData.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index b3ed546a3f..6bc99bd147 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -428,9 +428,9 @@ namespace TUGraz.VectoCore.Models.Declaration
case BusHVACSystemConfiguration.Configuration3 when !hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration3;
+
case BusHVACSystemConfiguration.Configuration4 when !hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration3;
-
case BusHVACSystemConfiguration.Configuration4 when hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration4;
@@ -456,21 +456,21 @@ namespace TUGraz.VectoCore.Models.Declaration
case BusHVACSystemConfiguration.Configuration8 when !hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration3;
case BusHVACSystemConfiguration.Configuration8 when !hasDriverHP && hasPassengerHP:
- return BusHVACSystemConfiguration.Configuration5;
+ return BusHVACSystemConfiguration.Configuration8;
case BusHVACSystemConfiguration.Configuration9 when !hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration3;
case BusHVACSystemConfiguration.Configuration9 when hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration4;
case BusHVACSystemConfiguration.Configuration9 when !hasDriverHP && hasPassengerHP:
- return BusHVACSystemConfiguration.Configuration5;
+ return BusHVACSystemConfiguration.Configuration8;
case BusHVACSystemConfiguration.Configuration9 when hasDriverHP && hasPassengerHP:
- return BusHVACSystemConfiguration.Configuration7;
+ return BusHVACSystemConfiguration.Configuration9;
case BusHVACSystemConfiguration.Configuration10 when !hasDriverHP && !hasPassengerHP:
return BusHVACSystemConfiguration.Configuration3;
case BusHVACSystemConfiguration.Configuration10 when !hasDriverHP && hasPassengerHP:
- return BusHVACSystemConfiguration.Configuration6;
+ return BusHVACSystemConfiguration.Configuration10;
}
throw new VectoException($"Invalid HVAC combination! System Configuration: {hvacConfigurationInput.GetName()}, Driver HeatPump: {heatPumpDriver.GetLabel()}, Passenger HeatPump: {heatPumpPassenger.GetLabel()}");
}
--
GitLab