From 59d52428a4f459b0f08e3903da01607f5d6922fc Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@gmail.com>
Date: Mon, 9 Mar 2015 09:57:32 +0100
Subject: [PATCH] renamed property names (full named, no appreviations)
---
.../Data/Engine/FullLoadCurve.cs | 12 ++++++------
.../Data/EngineOnlyDrivingCycle.cs | 16 ++++++++--------
.../SimulationComponent/CombustionEngineTest.cs | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs b/VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
index 9082495914..d4169f07e2 100644
--- a/VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
+++ b/VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
@@ -19,9 +19,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
{
private class FullLoadCurveEntry
{
- public double n { get; set; }
- public double Mfull { get; set; }
- public double Mdrag { get; set; }
+ public double EngineSpeed { get; set; }
+ public double TorqueFullLoad { get; set; }
+ public double TorqueDrag { get; set; }
public double PT1 { get; set; }
}
@@ -37,9 +37,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
foreach (DataRow row in data.Rows)
{
var entry = new FullLoadCurveEntry();
- entry.n = row.GetDouble("n");
- entry.Mfull = row.GetDouble("Mfull");
- entry.Mdrag = row.GetDouble("Mdrag");
+ entry.EngineSpeed = row.GetDouble("n");
+ entry.TorqueFullLoad = row.GetDouble("Mfull");
+ entry.TorqueDrag = row.GetDouble("Mdrag");
entry.PT1 = row.GetDouble("PT1");
fullLoadCurve.entries.Add(entry);
}
diff --git a/VectoCore/Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs b/VectoCore/Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs
index dde6c58ce6..34493133b7 100644
--- a/VectoCore/Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs
+++ b/VectoCore/Models/SimulationComponent/Data/EngineOnlyDrivingCycle.cs
@@ -24,21 +24,21 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
/// <summary>
/// Engine Speed
/// </summary>
- public double n { get; set; }
+ public double EngineSpeed { get; set; }
/// <summary>
/// Torque
/// </summary>
/// <remarks>Column "Me" in data file.</remarks>
- public double T { get; set; }
+ public double Torque { get; set; }
/// <summary>
/// Engine power
/// </summary>
- public double Pe
+ public double PowerEngine
{
- get { return 2.0 * Math.PI / 60.0 * T * n; }
- set { T = 60.0 / (2.0 * Math.PI) * value / n; }
+ get { return 2.0 * Math.PI / 60.0 * Torque * EngineSpeed; }
+ set { Torque = 60.0 / (2.0 * Math.PI) * value / EngineSpeed; }
}
/// <summary>
@@ -56,12 +56,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
foreach (DataRow row in data.Rows)
{
var cycle = new EngineOnlyDrivingCycle();
- cycle.n = row.GetDouble("n");
+ cycle.EngineSpeed = row.GetDouble("n");
if (data.Columns.Contains("Pe"))
- cycle.Pe = row.GetDouble("Pe");
+ cycle.PowerEngine = row.GetDouble("Pe");
else
- cycle.T = row.GetDouble("Me");
+ cycle.Torque = row.GetDouble("Me");
if (data.Columns.Contains("Padd"))
cycle.Padd = row.GetDouble("Padd");
diff --git a/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
index 747b49cb2f..276f7db486 100644
--- a/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
foreach (var cycle in data)
{
- port.Request(absTime, dt, cycle.T, cycle.n);
+ port.Request(absTime, dt, cycle.Torque, cycle.EngineSpeed);
engine.CommitSimulationStep(dataWriter);
absTime += dt;
--
GitLab