Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit ddd704a2 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #269 in VECTO/vecto-sim from... 

Merge pull request #269 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-345-case-insensitive-parsing-of-csv to develop

* commit 'c2003475':
  make cycle reader case insensitive
  extend testcases for case-insensitiv cycle detection/reading
  refactoring cycle tests, refactoring cycle reader
  test case sensitivity of datatable columns
parents 52a62354 c2003475
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs
+ 1
− 1
View file @ ddd704a2
......@@ -39,7 +39,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
throw new VectoException("PTO Idle LossMap must contain at least 2 entries.");
}
if (!data.Columns.Contains(Fields.EngineSpeed) || !data.Columns.Contains(Fields.PTOTorque)) {
if (!(data.Columns.Contains(Fields.EngineSpeed) && data.Columns.Contains(Fields.PTOTorque))) {
data.Columns[0].ColumnName = Fields.EngineSpeed;
data.Columns[1].ColumnName = Fields.PTOTorque;
LoggingObject.Logger<RetarderLossMap>().Warn(
......
VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
+ 26
− 21
View file @ ddd704a2
......@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.InputData.Reader
/// <exception cref="VectoException">CycleFile Format is unknown.</exception>
public static CycleType DetectCycleType(DataTable cycleData)
{
var cols = cycleData.Columns.Cast<DataColumn>().Select(c => c.ColumnName).ToArray();
var cols = cycleData.Columns;
if (PTOCycleDataParser.ValidateHeader(cols, false)) {
return CycleType.PTO;
......@@ -336,10 +336,12 @@ namespace TUGraz.VectoCore.InputData.Reader
private abstract class AbstractCycleDataParser : LoggingObject, ICycleDataParser
{
protected static bool CheckColumns(string[] header, IEnumerable<string> allowedCols, IEnumerable<string> requiredCols,
bool throwExceptions, bool allowAux)
protected static bool CheckColumns(DataColumnCollection header, IEnumerable<string> allowedCols,
IEnumerable<string> requiredCols, bool throwExceptions, bool allowAux)
{
var diff = header.GroupBy(c => c).Where(g => g.Count() > 2).SelectMany(g => g).ToList();
var headerStr = header.Cast<DataColumn>().Select(col => col.ColumnName.ToLowerInvariant()).ToArray();
var diff = headerStr.GroupBy(c => c).Where(g => g.Count() > 2).SelectMany(g => g).ToList();
if (diff.Any()) {
if (throwExceptions) {
throw new VectoException("Column(s) defined more than once: " + string.Join(", ", diff.OrderBy(x => x)));
......@@ -348,10 +350,10 @@ namespace TUGraz.VectoCore.InputData.Reader
}
if (allowAux) {
header = header.Where(c => !c.ToUpper().StartsWith(Constants.Auxiliaries.Prefix)).ToArray();
headerStr = headerStr.Where(c => !c.ToUpper().StartsWith(Constants.Auxiliaries.Prefix)).ToArray();
}
diff = header.Except(allowedCols).ToList();
diff = headerStr.Except(allowedCols.Select(x => x.ToLowerInvariant())).ToList();
if (diff.Any()) {
if (throwExceptions) {
throw new VectoException("Column(s) not allowed: " + string.Join(", ", diff));
......@@ -359,7 +361,7 @@ namespace TUGraz.VectoCore.InputData.Reader
return false;
}
diff = requiredCols.Except(header).ToList();
diff = requiredCols.Select(x => x.ToLowerInvariant()).Except(headerStr).ToList();
if (diff.Any()) {
if (throwExceptions) {
throw new VectoException("Column(s) required: " + string.Join(", ", diff));
......@@ -369,9 +371,12 @@ namespace TUGraz.VectoCore.InputData.Reader
return true;
}
protected static bool CheckComboColumns(string[] header, string[] cols, bool throwExceptions)
protected static bool CheckComboColumns(DataColumnCollection header, string[] cols, bool throwExceptions)
{
var colCount = header.Intersect(cols).Count();
var colCount = header.Cast<DataColumn>()
.Select(col => col.ColumnName.ToLowerInvariant())
.Intersect(cols.Select(x => x.ToLowerInvariant())).Count();
if (colCount != 0 && colCount != cols.Length) {
if (throwExceptions) {
throw new VectoException("Either all columns have to be defined or none of them: {0}", string.Join(", ", cols));
......@@ -389,7 +394,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
return table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Distance = row.ParseDouble(Fields.Distance).SI<Meter>(),
......@@ -407,7 +412,7 @@ namespace TUGraz.VectoCore.InputData.Reader
});
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
Fields.Distance,
......@@ -441,7 +446,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
var absTime = 0;
foreach (DataRow row in table.Rows) {
......@@ -472,7 +477,7 @@ namespace TUGraz.VectoCore.InputData.Reader
}
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
//Fields.Time not needed --> if missing 1 second resolution is assumed
......@@ -520,7 +525,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
var entries = table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
......@@ -533,7 +538,7 @@ namespace TUGraz.VectoCore.InputData.Reader
return entries;
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
Fields.Time,
......@@ -561,7 +566,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
var entries = table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
......@@ -577,7 +582,7 @@ namespace TUGraz.VectoCore.InputData.Reader
return entries;
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
Fields.Time,
......@@ -608,7 +613,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
var entries = table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
......@@ -630,7 +635,7 @@ namespace TUGraz.VectoCore.InputData.Reader
return entries;
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
Fields.Time,
......@@ -664,7 +669,7 @@ namespace TUGraz.VectoCore.InputData.Reader
{
public override IEnumerable<DrivingCycleData.DrivingCycleEntry> Parse(DataTable table, bool crossWindRequired)
{
ValidateHeader(table.Columns.Cast<DataColumn>().Select(col => col.ColumnName).ToArray());
ValidateHeader(table.Columns);
var entries = table.Rows.Cast<DataRow>().Select(row => new DrivingCycleData.DrivingCycleEntry {
Time = row.ParseDouble(Fields.Time).SI<Second>(),
......@@ -675,7 +680,7 @@ namespace TUGraz.VectoCore.InputData.Reader
return entries;
}
public static bool ValidateHeader(string[] header, bool throwExceptions = true)
public static bool ValidateHeader(DataColumnCollection header, bool throwExceptions = true)
{
var requiredCols = new[] {
Fields.Time,
......
VectoCore/VectoCoreTest/Models/Simulation/PTOIdleLossTest.cs
+ 18
− 0
View file @ ddd704a2
......@@ -33,14 +33,32 @@ using System;
using System.Collections.Generic;
using NUnit.Framework;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.Simulation
{
[TestFixture]
public class PTOIdleLossTest
{
[TestCase]
public void PTOLossMapCaseSensitiveTest()
{
var data = new[] {
"0, 0",
"10, 100"
};
var tbl = VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("pto torque, engine speed", data));
var pto = PTOIdleLossMapReader.Create(tbl);
var loss = pto.GetTorqueLoss(100.RPMtoRad());
Assert.AreEqual(10, loss.Value());
}
[TestCase]
public void PTOIdleLosses_FixPoints()
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about