Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of...

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus
correct sample xml file

VectoCore/VectoCore/Models/Simulation/ISimulatorFactoryFactory.cs

@@ -37,11 +37,6 @@ namespace TUGraz.VectoCore.Models.Simulation
 {
 	public interface ISimulatorFactoryFactory
 	{
-		ISimulatorFactory Factory(
-			ExecutionMode mode, 
-			IInputDataProvider dataProvider,
-			IOutputDataWriter writer, bool validate = true);
-
 		ISimulatorFactory Factory(ExecutionMode mode, 
 			IInputDataProvider dataProvider,
 			IOutputDataWriter writer,

VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml

@@ -45,7 +45,7 @@
 					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
-			<DragCurve gear="1">
+			<DragCurve>
 				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
 				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
 			</DragCurve>

VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs

@@ -294,7 +294,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			var jobContainer = new JobContainer(sumData);
 			var dataProvider = xmlInputReader.CreateEngineering(EngineeringSampleFile);
 
-			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter);
+			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter, null, null);
 			runsFactory.WriteModalResults = true;
 
 			Assert.That(() => jobContainer.AddRuns(runsFactory),

VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs

@@ -486,7 +486,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			var jobContainer = new JobContainer(sumData);
 			var dataProvider = XMLInputReader.CreateEngineering(EngineeringSampleFile);
 
-			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter);
+			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter, null, null);
 			runsFactory.WriteModalResults = true;
 
 			Assert.That(() => jobContainer.AddRuns(runsFactory),
@@ -757,7 +757,7 @@ namespace TUGraz.VectoCore.Tests.XML
 
 			var inputDataProvider = XMLInputReader.CreateEngineering(stream);
 
-			var factory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, inputDataProvider, new FileOutputWriter("dummy"));
+			var factory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, inputDataProvider, new FileOutputWriter("dummy"), null, null);
 
 			var jobContainer = new JobContainer(null);
 			Assert.That(() => jobContainer.AddRuns(factory),