diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
index e3d62c02bc94dd4f9aedc6f5babfeae21339e8f2..bfbd54f7b6a59325ead82d65c1a32a6f407e6b6c 100644
--- a/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
+++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.vb
@@ -287,7 +287,7 @@ Public Class BusAuxiliariesEngParametersForm
End If
End If
- HCUFileBrowser.UpdateHistory(file)
+ BusAuxFileBrowser.UpdateHistory(file)
Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = ""
diff --git a/VECTO/GUI/VectoVTPJobForm.vb b/VECTO/GUI/VectoVTPJobForm.vb
index 6e347e7d6f4c143cd60f2b95721952e26bee70aa..5e668ea080ed9f0a85458aff63a23492a053cc79 100644
--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -655,6 +655,19 @@ Public Class VectoVTPJobForm
s.MarkerSize = 3
s.Color = Color.Red
s.Name = "Map"
+ If (engine.EngineModes.First().Fuels.Count > 1) then
+ Dim fcMap2 As FuelConsumptionMap = FuelConsumptionMapReader.Create(engine.EngineModes.First().Fuels(1).FuelConsumptionMap)
+
+ Dim s2 As Series = New Series
+ s2.Points.DataBindXY(fcMap2.Entries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(),
+ fcMap2.Entries.Select(Function(x) x.Torque.Value()).ToArray())
+ s2.ChartType = SeriesChartType.Point
+ s2.MarkerSize = 3
+ s2.Color = Color.Green
+ s2.Name = "Map 2"
+ chart.Series.Add(s2)
+ End If
+
chart.Series.Add(s)
Dim engineCharacteristics As String =
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index c3b5b1058a7e9f77fcc2e6ab1b8351bcade4e5e5..958e40bb6ee1a86ec3a742613c16eadf37a73f0d 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -2096,7 +2096,6 @@ End Sub
' Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
' Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
' Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
-'>>>>>>> VECTO_CERT/master
Friend WithEvents Label17 As System.Windows.Forms.Label
Friend WithEvents btDelMaxTorqueEntry As System.Windows.Forms.Button
Friend WithEvents btAddMaxTorqueEntry As System.Windows.Forms.Button
@@ -2119,7 +2118,6 @@ End Sub
Friend WithEvents GroupBox9 As GroupBox
Friend WithEvents cbTankSystem As ComboBox
Friend WithEvents Label23 As Label
-'<<<<<<< HEAD
Friend WithEvents cbAtEcoRollReleaseLockupClutch As CheckBox
Friend WithEvents tpElectricComponents As TabPage
Friend WithEvents gpElectricMotor As GroupBox
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index e734fec68a25e9b38f5099c6105fc7f009ee2ff0..304115e9de5288c1c93c328ab79b70750ff97d2f 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -438,7 +438,7 @@ Public Class VehicleForm
if (declVehicle.TankSystem.HasValue) then
cbTankSystem.SelectedValue = declVehicle.TankSystem.Value
End If
-
+ else
tbPtoEngineSpeed.Text = vehicle.PTO_DriveEngineSpeed?.AsRPM.ToGUIFormat()
tbPtoGear.Text = if (not vehicle.PTO_DriveGear is nothing, vehicle.PTO_DriveGear.Gear.ToString() ,"")
End If
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 76e9275dbd987ec4eb780b38115c5ddf860fc444..d8d748873feca24f29444a10f3225a68bced3a9a 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -38,7 +38,6 @@ using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Models.Declaration;
namespace TUGraz.VectoCommon.InputData
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 15c4dcc6a941aadd1fa44f8d1195cfebef793444..dd7059729ab6e7a7a390dace87c41a6f3a5fe169 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -51,7 +51,6 @@ namespace TUGraz.VectoCommon.InputData
/// </summary>
IList<ICycleData> Cycles { get; }
- //ToDo Remove use JobType
IEngineEngineeringInputData EngineOnly { get; }
}
diff --git a/VectoCommon/VectoCommon/Models/WHRType.cs b/VectoCommon/VectoCommon/Models/WHRType.cs
index 2c637f9500750fe3899c613f0509639152190a36..9b4f8158cb633f0bccdc96dab1fc6505eecb4c49 100644
--- a/VectoCommon/VectoCommon/Models/WHRType.cs
+++ b/VectoCommon/VectoCommon/Models/WHRType.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace TUGraz.VectoCore.Models.Declaration {
+namespace TUGraz.VectoCommon.Models {
[Flags]
public enum WHRType
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
index 72a14c618ceb8002b6feb9b33e3884e46cdc61a6..abff89457f51f871ee566d57f1e3d8bcc81f0afd 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
@@ -38,12 +38,12 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
{
var entry = CreateEntry(row);
if (entry.Torque.IsGreaterOrEqual(0)) {
- delaunayMap.AddPoint(-entry.Torque.Value() * count, // * ratio * efficiency,
- entry.MotorSpeed.Value(), // / ratio,
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ entry.MotorSpeed.Value(),
-entry.PowerElectrical.Value() * count);
} else {
- delaunayMap.AddPoint(-entry.Torque.Value() * count, // * ratio / efficiency,
- entry.MotorSpeed.Value(), // / ratio,
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ entry.MotorSpeed.Value(),
-entry.PowerElectrical.Value() * count);
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
index e97a1b0627d3989b9afbe7c62657dffd14e817a4..ad4a03b385679a4282cdb8bd174029bbea5644db 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
@@ -24,6 +24,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
{
var result = new EfficiencyResult();
result.Torque = torque;
+ result.Speed = angularSpeed;
var value = _efficiencyMapMech2El.Interpolate(torque, angularSpeed);
if (!value.IsNaN())
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
index ccbe4d9cf656cb0974a23d364ab9b0b7505631fc..25b53db79b121ce15a883cf13f882efa5f043df0 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
@@ -214,7 +214,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
// PTO Active while drive (roadsweeping) shift rules
if (DataBus.DrivingCycleInfo.CycleData.LeftSample.PTOActive == PTOActivity.PTOActivityRoadSweeping) {
- if (gear == DesiredGearRoadsweeping) {
+ if (gear.Equals(DesiredGearRoadsweeping)) {
return false;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index 809361113fcf34761e788ad5aa1c618f009a60bb..9124477852578004a677c0b244ee1e90689f4fea 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -483,8 +483,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
};
}
-
-
CurrentState.SetState(0.SI<NewtonMeter>(), outAngularVelocity * effectiveRatio, outTorque,
outAngularVelocity);
CurrentState.Gear = ModelData.GearList.First();
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 680338274e63e80e9737f6c659712881bc4b5be9..ff256764d9e7401d11fbfb540570642ffd6304a6 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -938,7 +938,7 @@ public class JSONFileWriter : IOutputFileWriter
var job = input.JobInputData;
body.Add("SavedInDeclMode", job.SavedInDeclarationMode);
- body.Add("EngineOnlyMode", job.JobType);
+ body.Add("EngineOnlyMode", job.JobType == VectoSimulationJobType.EngineOnlySimulation);
body.Add("EngineFile", GetRelativePath(job.EngineOnly.DataSource.SourceFile, basePath));
diff --git a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
index f7e9b0d2c980ae78745a95a35b0bf2ef5951fa8c..a8e2eccb463268f57639960e646dbe9aeda7e3fb 100644
--- a/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/Engineering/Writer/XMLEngineeringJobWriter.cs
@@ -75,7 +75,7 @@ namespace TUGraz.VectoCore.OutputData.XML.Writer
InputData.DriverInputData, Writer, InputData.JobInputData.Vehicle.DataSource);
return new object[] {
- new XElement(v10 + XMLNames.VectoJob_EngineOnlyMode, InputData.JobInputData.JobType != VectoSimulationJobType.EngineOnlySimulation),
+ new XElement(v10 + XMLNames.VectoJob_EngineOnlyMode, InputData.JobInputData.JobType == VectoSimulationJobType.EngineOnlySimulation),
CreateVehicle(InputData.JobInputData.Vehicle),
new XElement(
v10 + XMLNames.Component_DriverModel,
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 491b793f18dc085d52c41d078260429eb7b5d70c..23d9cd95117599bfc8597e221cc16851766857e4 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -185,11 +185,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
@@ -226,11 +226,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
@@ -274,11 +274,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
@@ -321,11 +321,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
@@ -369,11 +369,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
@@ -417,11 +417,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
var gbxData = new EngineeringDataAdapter().CreateGearboxData(
new MockEngineeringInputProvider() {
- DriverInputData = new MockDriverInputData() {
+ DriverInputData = new MockDriverTestInputData() {
GearshiftInputData = (IGearshiftEngineeringInputData)inputProvider
},
- JobInputData = new MockJobInputData() {
- IEngineeringJobInputData_Vehicle = new MockEngineeringVehicleInputData() {
+ JobInputData = new MockJobTestInputData() {
+ Vehicle = new MockEngineeringVehicleInputData() {
GearboxInputData = inputProvider,
TorqueConverterInputData = (ITorqueConverterEngineeringInputData)inputProvider,
}
diff --git a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
index 233f680a270f56edd738389a6561a52a0db004c3..2452383f46726cbe8638a0eaa3908927857f8fad 100644
--- a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
@@ -76,9 +76,6 @@ namespace TUGraz.VectoCore.Tests.Integration
public static VehicleContainer CreatePowerTrain(DrivingCycleData cycleData, GearboxType gbxType, string modFileName,
bool overspeed = false, KilogramSquareMeter gearBoxInertia = null)
{
-
-
-
var gearboxData = CreateGearboxData(gbxType);
var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineFile, gearboxData.Gears.Count);
var axleGearData = CreateAxleGearData(gbxType);
diff --git a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
index 7ae71a1a3a18e9b37df634c6f65f10ed3c40428e..a2b2b4142746987510e307868107faa38349e417 100644
--- a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
@@ -5,6 +5,7 @@ using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.InputData.Reader.ComponentData;