From 4700ba006b199c7ebfa0f4f90c81855aa4ed08cf Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 9 Jul 2015 15:36:07 +0200
Subject: [PATCH] merge
---
VectoCore/Models/Declaration/DeclarationData.cs | 3 ++-
VectoCore/Models/Declaration/PT1.cs | 2 +-
VectoCore/Models/Declaration/Segments.cs | 4 ++--
VectoCore/Models/Declaration/Wheels.cs | 2 +-
VectoCore/VectoCore.csproj | 1 +
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/Models/Declaration/DeclarationData.cs
index 0b35894963..8576f92fde 100644
--- a/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/Models/Declaration/DeclarationData.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
+
namespace TUGraz.VectoCore.Models.Declaration
{
public class DeclarationData
@@ -45,7 +46,6 @@ namespace TUGraz.VectoCore.Models.Declaration
}
public static Meter DynamicTyreRadius(string wheels, string rims)
- public static Fan Fan
{
var wheelsEntry = Wheels.Lookup(wheels);
var rimsEntry = Rims.Lookup(rims);
@@ -55,6 +55,7 @@ namespace TUGraz.VectoCore.Models.Declaration
return wheelsEntry.TyreRadius * correction / (2 * Math.PI);
}
+ public static Fan Fan
{
get { return Instance()._fan ?? (Instance()._fan = new Fan()); }
}
diff --git a/VectoCore/Models/Declaration/PT1.cs b/VectoCore/Models/Declaration/PT1.cs
index a90f9e5781..cc1905e50f 100644
--- a/VectoCore/Models/Declaration/PT1.cs
+++ b/VectoCore/Models/Declaration/PT1.cs
@@ -12,7 +12,7 @@ namespace TUGraz.VectoCore.Models.Declaration
protected const string ResourceId = "TUGraz.VectoCore.Resources.Declaration.PT1.csv";
- public DeclarationPT1()
+ public PT1()
{
ParseData(ReadCsvResource(ResourceId));
}
diff --git a/VectoCore/Models/Declaration/Segments.cs b/VectoCore/Models/Declaration/Segments.cs
index 5ff41c30be..fb7ae7fc4a 100644
--- a/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/Models/Declaration/Segments.cs
@@ -12,7 +12,7 @@ namespace TUGraz.VectoCore.Models.Declaration
protected const string ResourceId = ResourceNamespace + "SegmentTable.csv";
- public DeclarationSegments()
+ public Segments()
{
ParseData(ReadCsvResource(ResourceId));
}
@@ -51,7 +51,7 @@ namespace TUGraz.VectoCore.Models.Declaration
private static IEnumerable<Mission> CreateMissions(Kilogram grossVehicleMassRating, Kilogram curbWeight, DataRow row)
{
- var missionTypes = Enum.GetValues(typeof (MissionType)).Cast<MissionType>();
+ var missionTypes = Enum.GetValues(typeof(MissionType)).Cast<MissionType>();
foreach (var missionType in missionTypes.Where(m => row.Field<string>(m.ToString()) == "1")) {
string vcdvField;
string axleField;
diff --git a/VectoCore/Models/Declaration/Wheels.cs b/VectoCore/Models/Declaration/Wheels.cs
index f3673fda34..8172deabb8 100644
--- a/VectoCore/Models/Declaration/Wheels.cs
+++ b/VectoCore/Models/Declaration/Wheels.cs
@@ -8,7 +8,7 @@ namespace TUGraz.VectoCore.Models.Declaration
{
protected const string ResourceId = "TUGraz.VectoCore.Resources.Declaration.Wheels.csv";
- public DeclarationWheels()
+ public Wheels()
{
ParseData(ReadCsvResource(ResourceId));
}
diff --git a/VectoCore/VectoCore.csproj b/VectoCore/VectoCore.csproj
index ac6c8e306e..5d135ff567 100644
--- a/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore.csproj
@@ -142,6 +142,7 @@
<Compile Include="Models\Declaration\Fan.cs" />
<Compile Include="Models\Declaration\HVAC.cs" />
<Compile Include="Models\Declaration\PneumaticSystem.cs" />
+ <Compile Include="Models\Declaration\Rims.cs" />
<Compile Include="Models\Declaration\SteeringPump.cs" />
<Compile Include="Models\Declaration\WHTCCorrection.cs" />
<Compile Include="Models\SimulationComponent\Data\AccelerationCurve.cs" />
--
GitLab