Set correct source type for XMLBatteryPackDeclarationInputDataProvider,

Check if SourceType is JSONFile, XMLFile or XMLEmbedded in BatteryDataAdapter

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs

@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			: base(componentNode, sourceFile)
 		{
 			_vehicle = vehicle;
-			SourceType = DataSourceType.XMLEmbedded;
+			//SourceType = DataSourceType.XMLEmbedded;
 		}
 
 		#region Implementation of IElectricStorageSystemDeclarationInputData
@@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		#region Implementation of IXMLResource
 
 		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
-		protected override DataSourceType SourceType { get; }
+		protected override DataSourceType SourceType => DataSourceType.XMLEmbedded;
 
 		#endregion
 		
@@ -157,10 +157,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
         #region Overrides of AbstractXMLResource
 
         protected override XNamespace SchemaNamespace => NamespaceURI;
-		protected override DataSourceType SourceType { get; }
+		protected override DataSourceType SourceType => DataSourceType.XMLFile;
 
 		#endregion
-    }
+	}
 
 
     public class XMLBatteryPackDeclarationInputDataMeasuredV23 : AbstractBatteryPackDeclarationInputDataProvider
@@ -241,7 +241,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			: base(componentNode, sourceFile)
 		{
 			throw new NotImplementedException("Replaced with v2.3 dataprovider");
-			SourceType = DataSourceType.XMLEmbedded;
+			//SourceType = DataSourceType.XMLEmbedded;
 		}
 		
 		#region Implementation of IREESSPackInputData
@@ -287,10 +287,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		#region Overrides of AbstractXMLResource
 
 		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
-		protected override DataSourceType SourceType { get; }
+		protected override DataSourceType SourceType => DataSourceType.XMLFile;
 
 		#endregion
-    }
+	}
 
     // ---------------------------------------------------------------------------------------
 
@@ -346,7 +346,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		
 		public XMLSuperCapDeclarationInputDataV24(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile)
 		{
-			SourceType = DataSourceType.XMLEmbedded;
+			//SourceType = DataSourceType.XMLEmbedded;
 		}
 		
 		#region Implementation of IREESSPackInputData
@@ -373,7 +373,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		#region Overrides of AbstractXMLResource
 
 		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
-		protected override DataSourceType SourceType { get; }
+		protected override DataSourceType SourceType => DataSourceType.XMLEmbedded;
 
 		#endregion
 	}

VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/BatteryDataAdapter.cs

 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Security.Policy;
 using TUGraz.VectoCommon.Exceptions;
@@ -59,12 +60,20 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
 						MaxCurrent = BatteryMaxCurrentReader.Create(b.MaxCurrentMap),
 						Capacity = b.Capacity,
 						InternalResistance =
-							BatteryInternalResistanceReader.Create(b.InternalResistanceCurve, entry.REESSPack.DataSource.SourceType.IsOneOf(DataSourceType.XMLFile, DataSourceType.XMLEmbedded)),
+							BatteryInternalResistanceReader.Create(b.InternalResistanceCurve, entry.REESSPack.DataSource.SourceType != DataSourceType.JSONFile),
 						SOCMap = BatterySOCReader.Create(b.VoltageCurve),
 						InputData = entry
 					};
 
-					retVal.Batteries.Add(Tuple.Create(entry.StringId, batteryData));
+#if DEBUG
+				if (!entry.REESSPack.DataSource.SourceType.IsOneOf(DataSourceType.JSONFile, DataSourceType.XMLFile,
+						DataSourceType.XMLEmbedded)) {
+					throw new VectoException(
+						$"Expected Datasource type to be JSONFile, XMLFile or XMLEmbedded but was {entry.REESSPack.DataSource.SourceType}");
+				};
+#endif
+
+				retVal.Batteries.Add(Tuple.Create(entry.StringId, batteryData));
 				//}
 			}