Code development platform for open source projects from the European Union institutions

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

adding name to delauney map for error messages

parent 2f5f8a0c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 39 deletions
VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs
+ 1
− 1
View file @ 4073b026
......@@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
Technology = a.Technology,
TechList = a.TechList.DefaultIfNull(Enumerable.Empty<string>()).ToArray(),
DemandType = AuxiliaryDemandType.Mapping,
Data = new AuxiliaryData(a) //AuxiliaryData.Create(a.DemandMap)
Data = new AuxiliaryData(a, a.ID) //AuxiliaryData.Create(a.DemandMap)
}).Concat(new VectoRunData.AuxData { ID = "", DemandType = AuxiliaryDemandType.Direct }.ToEnumerable()).ToList();
}
......
VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
+ 10
− 7
View file @ 4073b026
......@@ -43,8 +43,6 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
[CustomValidation(typeof(AuxiliaryData), "ValidateAuxMap")]
public class AuxiliaryData
{
......@@ -57,16 +55,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[Required, Range(double.Epsilon, 1)]
public double EfficiencyToEngine { get; set; }
[Required] private readonly DelauneyMap _map = new DelauneyMap();
[Required] private readonly DelauneyMap _map;
public Watt GetPowerDemand(PerSecond nAuxiliary, Watt powerAuxOut)
{
return _map.Interpolate(nAuxiliary.Value(), powerAuxOut.Value()).SI<Watt>();
}
public static AuxiliaryData ReadFromFile(string fileName)
public static AuxiliaryData ReadFromFile(string fileName, string id)
{
var auxData = new AuxiliaryData();
var auxData = new AuxiliaryData(id);
try {
var stream = new StreamReader(fileName);
......@@ -118,8 +116,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
}
}
internal AuxiliaryData(IAuxiliaryEngineeringInputData data)
internal AuxiliaryData(string id)
{
_map = new DelauneyMap(id);
}
internal AuxiliaryData(IAuxiliaryEngineeringInputData data, string id)
{
_map = new DelauneyMap("AuxiliaryData " + id);
TransmissionRatio = data.TransmissionRatio;
EfficiencyToEngine = data.EfficiencyToEngine;
EfficiencyToSupply = data.EfficiencyToSupply;
......@@ -132,7 +136,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
_map.Triangulate();
}
private AuxiliaryData() {}
private static bool HeaderIsValid(DataColumnCollection columns)
{
......
VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
+ 1
− 1
View file @ 4073b026
......@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
{
public class FuelConsumptionMap : SimulationComponentData
{
[Required, ValidateObject] private readonly DelauneyMap _fuelMap = new DelauneyMap();
[Required, ValidateObject] private readonly DelauneyMap _fuelMap = new DelauneyMap("FuelConsumptionMap");
private FuelConsumptionMap() {}
......
VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+ 11
− 6
View file @ 4073b026
......@@ -144,11 +144,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
GearName = gearName;
_ratio = gearRatio;
_entries = entries;
_lossMap = new DelauneyMap();
_invertedLossMap = new DelauneyMap();
_lossMap = new DelauneyMap("TransmissionLossMap " + GearName);
_invertedLossMap = new DelauneyMap("TransmissionLossMapInv. " + GearName);
foreach (var entry in _entries) {
_lossMap.AddPoint(entry.InputSpeed.ConvertTo().Rounds.Per.Minute.Value(), (entry.InputTorque - entry.TorqueLoss).Value(), entry.TorqueLoss.Value());
_invertedLossMap.AddPoint(entry.InputSpeed.ConvertTo().Rounds.Per.Minute.Value(), entry.InputTorque.Value(), entry.TorqueLoss.Value());
_lossMap.AddPoint(entry.InputSpeed.ConvertTo().Rounds.Per.Minute.Value(),
(entry.InputTorque - entry.TorqueLoss).Value(), entry.TorqueLoss.Value());
_invertedLossMap.AddPoint(entry.InputSpeed.ConvertTo().Rounds.Per.Minute.Value(), entry.InputTorque.Value(),
entry.TorqueLoss.Value());
}
_lossMap.Triangulate();
......@@ -164,7 +166,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
/// <returns>Torque loss as seen on input side (towards the engine).</returns>
public NewtonMeter GetTorqueLoss(PerSecond outAngularVelocity, NewtonMeter outTorque)
{
var torqueLoss = _lossMap.Interpolate(outAngularVelocity.ConvertTo().Rounds.Per.Minute.Value() * _ratio, outTorque.Value() / _ratio, true).SI<NewtonMeter>();
var torqueLoss =
_lossMap.Interpolate(outAngularVelocity.ConvertTo().Rounds.Per.Minute.Value() * _ratio, outTorque.Value() / _ratio,
true).SI<NewtonMeter>();
Log.Debug("GearboxLoss {0}: {1}, outAngularVelocity: {2}, outTorque: {3}", GearName, torqueLoss,
outAngularVelocity, outTorque);
......@@ -181,7 +185,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
public NewtonMeter GetOutTorque(PerSecond inAngularVelocity, NewtonMeter inTorque, bool allowExtrapolation = false)
{
var torqueLoss =
_invertedLossMap.Interpolate(inAngularVelocity.ConvertTo().Rounds.Per.Minute.Value(), inTorque.Value(), allowExtrapolation).SI<NewtonMeter>();
_invertedLossMap.Interpolate(inAngularVelocity.ConvertTo().Rounds.Per.Minute.Value(), inTorque.Value(),
allowExtrapolation).SI<NewtonMeter>();
return (inTorque - torqueLoss) / _ratio;
}
......
VectoCore/VectoCore/Utils/DelauneyMap.cs
+ 16
− 7
View file @ 4073b026
......@@ -53,6 +53,13 @@ namespace TUGraz.VectoCore.Utils
private readonly ThreadLocal<bool> _extrapolated = new ThreadLocal<bool>();
private readonly string _mapName;
public DelauneyMap(string name)
{
_mapName = name;
}
public bool Extrapolated
{
get { return _extrapolated.Value; }
......@@ -74,7 +81,8 @@ namespace TUGraz.VectoCore.Utils
public void Triangulate()
{
if (Points.Count < 3) {
throw new ArgumentException(string.Format("Triangulation needs at least 3 Points. Got {0} Points.", Points.Count));
throw new ArgumentException(string.Format("{0}: Triangulation needs at least 3 Points. Got {1} Points.", _mapName,
Points.Count));
}
SanitycheckInputPoints();
......@@ -85,7 +93,7 @@ namespace TUGraz.VectoCore.Utils
var max = Points.Max(point => Math.Max(Math.Abs(point.X), Math.Abs(point.Y))) * superTriangleScalingFactor;
var superTriangle = new Triangle(new Point(max, 0), new Point(0, max), new Point(-max, -max));
var triangles = new List<Triangle> { superTriangle };
var pointCount = 0;
var points = Points.ToArray();
......@@ -102,7 +110,7 @@ namespace TUGraz.VectoCore.Utils
var point1 = point;
var containerTriangles = triangles.FindAll(t => t.ContainsInCircumcircle(point1));
triangles = triangles.Except(containerTriangles).ToList();
// Remove duplicate edges. This leaves the convex hull of the edges.
// The edges in this convex hull are oriented counterclockwise!
var allEdges = containerTriangles.SelectMany(t => t.GetEdges()).ToList();
......@@ -179,10 +187,11 @@ namespace TUGraz.VectoCore.Utils
var frame = new StackFrame(2);
var method = frame.GetMethod();
var type = method.DeclaringType.Name;
var methodName = method.Name;
var type = string.Join("", method.DeclaringType.Name.Split(Path.GetInvalidFileNameChars()));
var methodName = string.Join("", method.Name.Split(Path.GetInvalidFileNameChars()));
Directory.CreateDirectory("delauney");
chart.SaveImage(string.Format("delauney\\{0}_{1}_{2}_{3}.png", type, methodName, superTriangle.GetHashCode(), i), ChartImageFormat.Png);
chart.SaveImage(string.Format("delauney\\{0}_{1}_{2}_{3}.png", type, methodName, superTriangle.GetHashCode(), i),
ChartImageFormat.Png);
}
}
......@@ -198,7 +207,7 @@ namespace TUGraz.VectoCore.Utils
}
if (!allowExtrapolation) {
throw new VectoException("Interpolation failed. x: {0}, y: {1}", x, y);
throw new VectoException("{2}: Interpolation failed. x: {0}, y: {1}", x, y, _mapName);
}
Extrapolated = true;
......
VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+ 3
− 3
View file @ 4073b026
......@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var aux = new EngineAuxiliary(container);
var auxData = AuxiliaryData.ReadFromFile(@"TestData\Components\24t_Coach_ALT.vaux");
var auxData = AuxiliaryData.ReadFromFile(@"TestData\Components\24t_Coach_ALT.vaux", "ALT");
// ratio = 4.078
// efficiency_engine = 0.96
// efficiency_supply = 0.98
......@@ -246,7 +246,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var aux = new EngineAuxiliary(container);
var auxData = AuxiliaryData.ReadFromFile(@"TestData\Components\24t_Coach_ALT.vaux");
var auxData = AuxiliaryData.ReadFromFile(@"TestData\Components\24t_Coach_ALT.vaux", "ALT");
// ratio = 4.078
// efficiency_engine = 0.96
// efficiency_supply = 0.98
......@@ -297,7 +297,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
[TestMethod]
public void AuxFileMissing()
{
AssertHelper.Exception<VectoException>(() => AuxiliaryData.ReadFromFile(@"NOT_EXISTING_AUX_FILE.vaux"),
AssertHelper.Exception<VectoException>(() => AuxiliaryData.ReadFromFile(@"NOT_EXISTING_AUX_FILE.vaux", "N.A."),
"Auxiliary file not found: NOT_EXISTING_AUX_FILE.vaux");
}
......
VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs
+ 29
− 14
View file @ 4073b026
......@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.Tests.Utils
[TestMethod]
public void Test_Simple_DelauneyMap()
{
var map = new DelauneyMap();
var map = new DelauneyMap("TEST");
map.AddPoint(0, 0, 0);
map.AddPoint(1, 0, 0);
map.AddPoint(0, 1, 0);
......@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.Tests.Utils
[TestMethod]
public void Test_DelauneyMapTriangle()
{
var map = new DelauneyMap();
var map = new DelauneyMap("TEST");
map.AddPoint(0, 0, 0);
map.AddPoint(1, 0, 1);
map.AddPoint(0, 1, 2);
......@@ -82,15 +82,15 @@ namespace TUGraz.VectoCore.Tests.Utils
AssertHelper.AreRelativeEqual(1.5, map.Interpolate(0, 0.75));
// extrapolation (should fail)
AssertHelper.Exception<VectoException>(() => map.Interpolate(1, 1), "Interpolation failed. x: 1, y: 1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(-1, -1), "Interpolation failed. x: -1, y: -1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(1, -1), "Interpolation failed. x: 1, y: -1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(-1, 1), "Interpolation failed. x: -1, y: 1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(1, 1), "TEST: Interpolation failed. x: 1, y: 1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(-1, -1), "TEST: Interpolation failed. x: -1, y: -1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(1, -1), "TEST: Interpolation failed. x: 1, y: -1");
AssertHelper.Exception<VectoException>(() => map.Interpolate(-1, 1), "TEST: Interpolation failed. x: -1, y: 1");
}
public void Test_DelauneyMapPlane()
{
var map = new DelauneyMap();
var map = new DelauneyMap("TEST");
map.AddPoint(0, 0, 0);
map.AddPoint(1, 0, 1);
map.AddPoint(0, 1, 2);
......@@ -132,27 +132,42 @@ namespace TUGraz.VectoCore.Tests.Utils
[TestMethod]
public void Test_Delauney_LessThan3Points()
{
AssertHelper.Exception<ArgumentException>(() => new DelauneyMap().Triangulate(),
"Triangulation needs at least 3 Points. Got 0 Points.");
AssertHelper.Exception<ArgumentException>(() => new DelauneyMap("TEST").Triangulate(),
"TEST: Triangulation needs at least 3 Points. Got 0 Points.");
AssertHelper.Exception<ArgumentException>(() => {
var map1 = new DelauneyMap();
var map1 = new DelauneyMap("TEST");
map1.AddPoint(1, 0, 0);
map1.Triangulate();
}, "Triangulation needs at least 3 Points. Got 1 Points.");
}, "TEST: Triangulation needs at least 3 Points. Got 1 Points.");
AssertHelper.Exception<ArgumentException>(() => {
var map2 = new DelauneyMap();
var map2 = new DelauneyMap("TEST");
map2.AddPoint(1, 0, 0);
map2.AddPoint(0, 1, 0);
map2.Triangulate();
}, "Triangulation needs at least 3 Points. Got 2 Points.");
}, "TEST: Triangulation needs at least 3 Points. Got 2 Points.");
var map = new DelauneyMap();
var map = new DelauneyMap("TEST");
map.AddPoint(1, 0, 0);
map.AddPoint(0, 1, 0);
map.AddPoint(0, 0, 1);
map.Triangulate();
}
[TestMethod]
public void Test_Delauney_DuplicatePoints()
{
var map = new DelauneyMap("TEST");
map.AddPoint(0, 0, 0);
map.AddPoint(1, 0, 1);
map.AddPoint(1, 1, 3);
map.AddPoint(0, 1, 2);
map.AddPoint(1, 1, 5);
AssertHelper.Exception<VectoException>(() => { map.Triangulate(); },
"TEST: Input Data for Delauney map contains duplicates!\n1 / 1");
}
}
}
\ No newline at end of file
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