From 47fc4c50dafa15ab2f882a05f6261a46eb64cb26 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 15 Sep 2016 16:32:22 +0200
Subject: [PATCH] changing return type DataTable to TableData
---
VectoCommon/VectoCommon/InputData/DeclarationInputData.cs | 4 ++--
VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs | 2 +-
VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs | 2 +-
VectoCore/VectoCore/InputData/Impl/InputData.cs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index ed87326f16..1eb58e359f 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -261,7 +261,7 @@ namespace TUGraz.VectoCommon.InputData
/// P096, P097, P098
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- DataTable LossMap { get; }
+ TableData LossMap { get; }
/// <summary>
/// P079
@@ -344,7 +344,7 @@ namespace TUGraz.VectoCommon.InputData
/// P028, P029, P030, P031, P032, P119, P120, P121, P122, P123, P124, P125, P126
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- DataTable CycleData { get; }
+ TableData CycleData { get; }
}
public interface IDriverDeclarationInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index 6de5467139..0ca3625a09 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public DataTable LossMap
+ public TableData LossMap
{
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
"CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 59dff40155..58acc3f130 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -312,7 +312,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
foreach (var cycle in Body.GetEx(JsonKeys.Job_Cycles)) {
//.Select(cycle =>
var cycleFile = Path.Combine(BasePath, cycle.Value<string>());
- DataTable cycleData;
+ TableData cycleData;
if (File.Exists(cycleFile)) {
cycleData = VectoCSVFile.Read(cycleFile);
} else {
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index ca8bdf5347..22c6fbf007 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.InputData.Impl
{
public string Name { get; internal set; }
- public DataTable CycleData { get; internal set; }
+ public TableData CycleData { get; internal set; }
}
public class StartStopInputData : IStartStopEngineeringInputData
--
GitLab