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
Commit c42f86da authored by Michael KRISPER's avatar Michael KRISPER
Browse files

better default value handling in Lookup

parent 3b994079
Branches
Tags
No related merge requests found
......@@ -66,8 +66,10 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
public override Watt Lookup(MissionType missionType, string technology = "Standard technology")
public override Watt Lookup(MissionType missionType, string technology = null)
{
if (string.IsNullOrWhiteSpace(technology))
technology = "Standard technology";
var value = base.Lookup(missionType, technology);
return value / _alternator.Lookup(missionType);
}
......@@ -99,8 +101,10 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
public override double Lookup(MissionType missionType, string technology = "Standard alternator efficiency")
public override double Lookup(MissionType missionType, string technology = null)
{
if (string.IsNullOrWhiteSpace(technology))
technology = "Standard alternator efficiency";
return base.Lookup(missionType, technology);
}
}
......
......@@ -63,7 +63,7 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
public override Watt Lookup(MissionType mission, string technology)
public override Watt Lookup(MissionType mission, string technology = null)
{
if (string.IsNullOrWhiteSpace(technology))
technology = "Crankshaft mounted - Electronically controlled visco clutch";
......
......@@ -29,10 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
......@@ -40,10 +36,14 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Tests.Utils;
// ReSharper disable ObjectCreationAsStatement
......@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
aux.AddConstant("STP",
SteeringPump.Lookup(MissionType.LongHaul, hdvClass,
new[] { "Variable displacement mech. controlled" }));
aux.AddConstant("ES", DeclarationData.ElectricSystem.Lookup(mission, null));
aux.AddConstant("ES", DeclarationData.ElectricSystem.Lookup(mission));
aux.AddConstant("AC",
DeclarationData.HeatingVentilationAirConditioning.Lookup(mission, hdvClass));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment