Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

adapt testcases: changed signature of electric system constructor

parent 81c5c3b3
No related branches found
No related tags found
No related merge requests found
......@@ -930,7 +930,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, runData.BatteryData);
var battery = new BatterySystem(container, batteryData);
battery.Initialize(initialBatCharge);
......
......@@ -1695,7 +1695,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
var strategy = gearboxType.AutomaticTransmission()
? (IHybridControlStrategy) new HybridStrategyAT(runData, container)
: new HybridStrategy(runData, container);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
var battery = new BatterySystem(container, batteryData);
battery.Initialize(initialBatCharge);
......
......@@ -692,7 +692,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
sumData) { RunData = runData };
var strategy = new SerialHybridStrategy(runData, container);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
var battery = new BatterySystem(container, batteryData);
battery.Initialize(initialBatCharge);
......
......@@ -616,6 +616,9 @@ public class SSMHeatingPostProcessingCorrection
m.Setup(x => x.TimeIntegral<WattSecond>(ModalResultField.P_reess_terminal, It.IsAny<Func<SI, bool>>()))
.Returns<ModalResultField,
Func<SI, bool>>((_, f) => batteryEntries.Select(x => x.Item2).Where(x => f(x)).Sum());
m.Setup(x => x.TimeIntegral<WattSecond>(ModalResultField.P_terminal_ES, It.IsAny<Func<SI, bool>>()))
.Returns<ModalResultField,
Func<SI, bool>>((_, f) => batteryEntries.Select(x => x.Item2).Where(x => f(x)).Sum());
m.Setup(x => x.GetValues<SI>(ModalResultField.REESSStateOfCharge)).Returns(new[] { 0.5.SI<Scalar>(), 0.4.SI<Scalar>() });
}
......
......@@ -910,7 +910,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
},
InitialSoC = reessSoC.Value
};
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, runData.BatteryData);
var battery = new BatterySystem(container, runData.BatteryData);
battery.Initialize(runData.BatteryData.InitialSoC);
container.BatteryInfo = battery;
......
......@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var batteryData = dao.CreateBatteryData(tmp, 0.8);
var container = new MockVehicleContainer();
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
var bat = new Battery(container, batteryData.Batteries.First().Item2);
es.Connect(bat);
es.Connect(new MockElectricConsumer(auxPower.SI<Watt>()));
......@@ -208,7 +208,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var container = new MockVehicleContainer();
var bat = new Battery(container, batteryData.Batteries.First().Item2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(bat);
es.Connect(new MockElectricConsumer(auxPower.SI<Watt>()));
bat.Initialize(initialSoC);
......@@ -253,7 +253,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var container = new MockVehicleContainer();
var batId = batteryData.Batteries.First().Item2.BatteryId;
var bat = new Battery(container, batteryData.Batteries.First().Item2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(bat);
es.Connect(new MockElectricConsumer(0.SI<Watt>()));
bat.Initialize(initialSoC);
......@@ -372,7 +372,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var batId = batteryData.Batteries.First().Item2.BatteryId;
var bat = new Battery(container, batteryData.Batteries.First().Item2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(bat);
es.Connect(new MockElectricConsumer(0.SI<Watt>()));
bat.Initialize(initialSoC);
......@@ -499,7 +499,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var container = new MockVehicleContainer();
var bat = new BatterySystem(container, batteryData);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(bat);
es.Connect(new MockElectricConsumer(0.SI<Watt>()));
bat.Initialize(initialSoC);
......@@ -617,7 +617,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var container = new MockVehicleContainer();
var bat = new BatterySystem(container, batteryData);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(bat);
es.Connect(new MockElectricConsumer(0.SI<Watt>()));
bat.Initialize(initialSoC);
......
......@@ -14,6 +14,7 @@ using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricComponents.Battery;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
......@@ -105,7 +106,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var battery = new MockBattery();
container.BatteryInfo = battery;
var motor = new ElectricMotor(container, data.First().Item2, strategy, PowertrainPosition.HybridP2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, new BatterySystemData());
es.Connect(battery);
motor.Connect(es);
......@@ -152,7 +153,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var battery = new MockBattery();
container.BatteryInfo = battery;
var motor = new ElectricMotor(container, data.First().Item2, strategy, PowertrainPosition.HybridP2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, new BatterySystemData());
es.Connect(battery);
motor.Connect(es);
......@@ -200,7 +201,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
container.BatteryInfo = battery;
var motor = new ElectricMotor(container, data.First().Item2, strategy, PowertrainPosition.HybridP2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, new BatterySystemData());
es.Connect(battery);
motor.Connect(es);
var tnPort = new MockTnOutPort();
......@@ -249,7 +250,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var battery = new MockBattery();
container.BatteryInfo = battery;
var motor = new ElectricMotor(container, data.First().Item2, strategy, PowertrainPosition.HybridP2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, new BatterySystemData());
es.Connect(battery);
motor.Connect(es);
var tnPort = new MockTnOutPort();
......@@ -297,7 +298,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
};
var batteryData = dao.CreateBatteryData(tmp, 0.8);
var battery = new Battery(container, batteryData.Batteries.First().Item2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(battery);
container.BatteryInfo = battery;
......@@ -362,7 +363,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var batteryData = dao.CreateBatteryData(tmp, 0.8);
var battery = new Battery(container, batteryData.Batteries.First().Item2);
container.BatteryInfo = battery;
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(battery);
battery.Initialize(initialSoc);
var motor = new ElectricMotor(container, data.First().Item2, strategy, PowertrainPosition.HybridP2);
......@@ -429,7 +430,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
new EngineOnlyGearboxInfo(container);
var battery = new Battery(container, batteryData.Batteries.First().Item2);
var es = new ElectricSystem(container);
var es = new ElectricSystem(container, batteryData);
es.Connect(battery);
battery.Initialize(initialSoc);
......
......@@ -720,6 +720,9 @@ namespace TUGraz.VectoCore.Tests.Reports
m.Setup(x => x.TimeIntegral<WattSecond>(ModalResultField.P_reess_terminal, It.IsAny<Func<SI, bool>>()))
.Returns<ModalResultField,
Func<SI, bool>>((_, f) => batteryEntries.Select(x => x.Item2).Where(x => f(x)).Sum());
m.Setup(x => x.TimeIntegral<WattSecond>(ModalResultField.P_terminal_ES, It.IsAny<Func<SI, bool>>()))
.Returns<ModalResultField,
Func<SI, bool>>((_, f) => batteryEntries.Select(x => x.Item2).Where(x => f(x)).Sum());
m.Setup(x => x.GetValues<SI>(ModalResultField.REESSStateOfCharge))
.Returns(new[] { 0.5.SI<Scalar>(), 0.4.SI<Scalar>() });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment