diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs index ca76f42a5e23ddc60eab616008b978639420bd1c..9d490cf0d46c018deb84e40ab3059a6498054b70 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs @@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl { return Runs.Select( - r => new CycleTypeDescription { Name = r.Run.CycleName, CycleType = r.Run.GetContainer().RunData.Cycle.CycleType }) + r => new CycleTypeDescription { Name = r.Run.CycleName, CycleType = r.Run.GetContainer().RunData.Cycle?.CycleType ?? CycleType.None }) .Distinct(); } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs index b565df6044119b33fe4cfff8cc5f92b994966c88..ac505a6c23935700be8a8df6f138e23f841ab02c 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs @@ -47,7 +47,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data MeasuredSpeed, MeasuredSpeedGear, PTO, - VTP + VTP, + None } public static class CycleTypeHelper diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.tt b/VectoCore/VectoCore/Utils/VectoVersionCore.tt index 568267363d13908989435d9c2d74f00e7c3ac2a9..1a06dcd847e98675285070e9c894d94b2114cab1 100644 --- a/VectoCore/VectoCore/Utils/VectoVersionCore.tt +++ b/VectoCore/VectoCore/Utils/VectoVersionCore.tt @@ -37,9 +37,12 @@ namespace TUGraz.VectoCore.Utils public static class VectoSimulationCore { +#if BETA_RELEASE + private const string SUFFIX = "-DEV"; +#else #if RELEASE_CANDIDATE private const string SUFFIX = "-RC"; -#else +#endif private const string SUFFIX = ""; #endif diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs index 2593f35cfc157e14e003de24a60c468c5d6af3be..f8c750b80f48516e3d46e16c072df9cddd03512f 100644 --- a/VectoCore/VectoCore/Utils/XMLHelper.cs +++ b/VectoCore/VectoCore/Utils/XMLHelper.cs @@ -55,8 +55,8 @@ namespace TUGraz.VectoCore.Utils { public static object[] ValueAsUnit(Watt power, string unit, uint? decimals = 0) { switch (unit) { - case "kW": return GetValueAsUnit(power.ConvertToKiloWatt(), unit, decimals); - case "W": return GetValueAsUnit(power.Value(), unit, decimals); + case "kW": return GetValueAsUnit(power?.ConvertToKiloWatt(), unit, decimals); + case "W": return GetValueAsUnit(power?.Value(), unit, decimals); } throw new NotImplementedException(string.Format("unknown unit '{0}'", unit)); } @@ -104,11 +104,14 @@ namespace TUGraz.VectoCore.Utils { } } - private static object[] GetValueAsUnit(double value, string unit, uint? decimals) + private static object[] GetValueAsUnit(double? value, string unit, uint? decimals) { + if (value == null) { + return new object[0]; + } return new object[] { new XAttribute(XMLNames.Report_Results_Unit_Attr, unit), - value.ToXMLFormat(decimals) + value.Value.ToXMLFormat(decimals) }; } diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4 index 78d4e8ed1d7eb99bf028d07419c2b15a65db101d..725b47b40a66787fbce198335865a9821e5aba7f 100644 --- a/VectoCore/VectoCore/VersionNumber.t4 +++ b/VectoCore/VectoCore/VersionNumber.t4 @@ -6,6 +6,6 @@ int GetBuildNumber() string GetVectoCoreVersionNumber() { - return "3.3.0." + GetBuildNumber(); + return "3.3.1." + GetBuildNumber(); } #> \ No newline at end of file