Merge branch...

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

VECTO/Configuration.vb

@@ -123,11 +123,11 @@ Public Class Configuration
 				DeclMode = body.GetEx(Of Boolean)(_declmode)
 				ValidateRunData = IsNothing(body(_validaterundata)) OrElse body.GetEx(Of Boolean)(_validaterundata)
                 OutputFolder = If(body(_outputfolder) Is Nothing, "", body(_outputfolder).Value(of string)())
-				SaveVectoRunData = body.GetEx(Of Boolean)(_saverundata)
+				SaveVectoRunData = If(body(_saverundata) Is Nothing, False, body.GetEx(Of Boolean)(_saverundata))
 
-				InitialSOCOverride = body.GetEx(Of Boolean)(_overrideinitialsoc)
-				InitialSOCOverrideValue = body.GetEx(Of Double)(_overrideinitialsocvalue)
-				ChargeSustainingIterationModeDeActivated = body.GetEx(Of Boolean)(_csItActive)
+				InitialSOCOverride = if(body(_overrideinitialsoc) is nothing, false, body.GetEx(Of Boolean)(_overrideinitialsoc))
+				InitialSOCOverrideValue = if (body(_overrideinitialsoc) Is Nothing, 50, body.GetEx(Of Double)(_overrideinitialsocvalue))
+				ChargeSustainingIterationModeDeActivated = if (body(_csItActive) Is Nothing, true, body.GetEx(Of Boolean)(_csItActive))
 
 
 			End Using

VectoCore/VectoCore/InputData/Reader/ComponentData/IEPCMapReader.cs

@@ -140,7 +140,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
 			IList<EfficiencyMap.Entry> entries, ElectricMotorFullLoadCurve fullLoadCurve)
 		{
 			var clusterer = new MeanShiftClustering();
-			var clusterTolerance = 1e-1;
+			var clusterTolerance = 50.RPMtoRad().Value();
 			var extrapolationfactor = Constants.PowerMapSettings.EfficiencyMapExtrapolationFactor;
 
 			//ignore entries where speed is 0, added manually to speed bucket (clustering doesn't work because the distance is too small)

VectoCore/VectoCore/OutputData/SummaryDataContainer.cs

@@ -1025,6 +1025,12 @@ namespace TUGraz.VectoCore.OutputData
 			foreach (var aux in modData.Auxiliaries) {
 				var colName = GetAuxColName(aux.Key);
 				row[colName] = SumDataFields.AuxDataValue(runData, modData, aux.Value);
+				var auxTechCol = string.Format(SumDataFields.AUX_TECH_FORMAT, aux.Key);
+				if (Table.Columns.Contains(auxTechCol)) {
+					row[auxTechCol] = runData.Aux
+						.First(x => x.ID.Equals(aux.Key, StringComparison.InvariantCultureIgnoreCase))
+						.Technology.Join("; ");
+				}
 			}
 
 			if ((runData.GearboxData?.Gears.Count ?? 0) > 0) {