From 9f60600910aad2e4dc376a1c7d30649b4b0695ec Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Wed, 8 Mar 2023 12:53:49 +0100
Subject: [PATCH] multiply soc range with 100 (its in percent), divide delta
soc by 100
---
.../VectoCore/Models/Declaration/InitEquivalenceFactors.cs | 2 +-
.../IterativeRunStrategies/OVCHevIterativeRunStrategy.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs b/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
index ecffa11367..124c835c2e 100644
--- a/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
+++ b/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
@@ -50,7 +50,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public double LookupEquivalenceFactor(MissionType mission, VehicleClass hdvClass, LoadingType loading,
double socRange)
{
- var a = _socRanges.MinBy((i => Math.Abs(socRange - i))); //closest
+ var a = _socRanges.MinBy((i => Math.Abs(socRange * 100 - i))); //closest
if (socRange <= _socRanges.Min() || socRange >= _socRanges.Max()) {
return _initEquivalenceFactors[a].LookupEquivalenceFactor(mission, hdvClass, loading);
diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
index 185d9f7a34..424141934c 100644
--- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
+++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
@@ -62,7 +62,7 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies
f_equiv_1 = _results[iteration].f_equiv;
d_soc_1 = _results[iteration].d_soc;
- f_equiv_2 = f_equiv_1 - (d_soc_1 / k);
+ f_equiv_2 = f_equiv_1 - (d_soc_1/100 / k);
runData.HybridStrategyParameters.EquivalenceFactor = f_equiv_2;
runData.HybridStrategyParameters.EquivalenceFactorCharge = f_equiv_2 * factorCharge;
@@ -70,8 +70,8 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies
break;
case 1:
- d_soc_1 = _results[0].d_soc;
- d_soc_2 = _results[1].d_soc;
+ d_soc_1 = _results[0].d_soc / 100;
+ d_soc_2 = _results[1].d_soc / 100;
f_equiv_1 = _results[0].f_equiv;
f_equiv_2 = _results[1].f_equiv;
--
GitLab