diff --git a/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs b/VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs index ecffa11367253e3ef4742cc74d19501e27598b0e..124c835c2e09fdb03dbf1205000e4b0500d81a80 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 185d9f7a345710a42fca29818410d0604877248c..424141934c70b6dce5b9140ad10c9819d0eeb7ed 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;