introduce new class TableData (extends DataTable and adds source information),...

introduce new class TableData (extends DataTable and adds source information), use TableData in interfaces instead of DataTable (fully compatible)

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -129,7 +129,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P057, P058
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable LossMap { get; }
+		TableData LossMap { get; }
 	}
 
 	public interface IAngularGearInputData : IComponentInputData
@@ -147,7 +147,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// <summary>
 		/// P173, P174, P175
 		/// </summary>
-		DataTable LossMap { get; }
+		TableData LossMap { get; }
 
 		/// <summary>
 		/// P177
@@ -215,7 +215,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P096, P097, P098
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable LossMap { get; }
+		TableData LossMap { get; }
 
 		/// <summary>
 		/// P079
@@ -239,7 +239,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P093, P094, P095
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable ShiftPolygon { get; }
+		TableData ShiftPolygon { get; }
 
 		///// <summary>
 		///// P077
@@ -278,7 +278,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		// ReSharper disable once InconsistentNaming
-		DataTable TCData { get; }
+		TableData TCData { get; }
 	}
 
 	public interface IEngineDeclarationInputData : IComponentInputData
@@ -319,14 +319,14 @@ namespace TUGraz.VectoCommon.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// engine speed in rpm, torque in NM, fuel consumption in g/h
 		/// </summary>
-		DataTable FuelConsumptionMap { get; }
+		TableData FuelConsumptionMap { get; }
 
 		/// <summary>
 		/// P144
 		/// P068, P069, P70, P71
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable FullLoadCurve { get; }
+		TableData FullLoadCurve { get; }
 	}
 
 	public interface IAuxiliariesDeclarationInputData

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

@@ -92,7 +92,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P055, P056
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable CrosswindCorrectionMap { get; }
+		TableData CrosswindCorrectionMap { get; }
 	}
 
 	public interface IPTOTransmissionInputData
@@ -105,9 +105,9 @@ namespace TUGraz.VectoCommon.InputData
 		/// <summary>
 		/// The PTO Loss map for idling losses of the "consumer" part.
 		/// </summary>
-		DataTable PTOLossMap { get; }
+		TableData PTOLossMap { get; }
 
-		DataTable PTOCycle { get; }
+		TableData PTOCycle { get; }
 	}
 
 	public interface IAxleEngineeringInputData : IAxleDeclarationInputData
@@ -219,7 +219,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// </summary>
 		KilogramSquareMeter Inertia { get; }
 
-		DataTable ShiftPolygon { get; }
+		TableData ShiftPolygon { get; }
 	}
 
 	public interface IEngineEngineeringInputData : IEngineDeclarationInputData
@@ -258,7 +258,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P009; P033, P034, P035
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable AccelerationCurve { get; }
+		TableData AccelerationCurve { get; }
 
 		ILookaheadCoastingInputData Lookahead { get; }
 	}
@@ -329,9 +329,9 @@ namespace TUGraz.VectoCommon.InputData
 
 		double LookaheadDistanceFactor { get; }
 
-		DataTable CoastingDecisionFactorTargetSpeedLookup { get; }
+		TableData CoastingDecisionFactorTargetSpeedLookup { get; }
 
-		DataTable CoastingDecisionFactorVelocityDropLookup { get; }
+		TableData CoastingDecisionFactorVelocityDropLookup { get; }
 	}
 
 	public interface IAuxiliaryEngineeringInputData
@@ -369,7 +369,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P025, P026, P027  Aux-InputFile: map
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable DemandMap { get; }
+		TableData DemandMap { get; }
 
 		/// <summary>
 		/// P178

VectoCommon/VectoCommon/InputData/TableData.cs

+using System.Data;
+
+namespace TUGraz.VectoCommon.InputData
+{
+	public class TableData : DataTable
+	{
+		public enum DataSourceType
+		{
+			Embedded,
+			CSVFile,
+		}
+
+		public TableData(string fileName)
+		{
+			SourceType = DataSourceType.CSVFile;
+			Source = fileName;
+		}
+
+		public TableData()
+		{
+			SourceType = DataSourceType.Embedded;
+			Source = "";
+		}
+
+		public DataSourceType SourceType { get; protected set; }
+
+		public string Source { get; protected set; }
+	}
+}
\ No newline at end of file