diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx index b353c90b841e708cb028650dcd7849b73e8c9db1..8bff50339356cdc703753c405d8e996ed61698b6 100644 Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs index 480523a6357cd0ea5b61d48a2c42843dcc625a46..64af8453d7fa9575b0a459a00968c71a33635648 100644 --- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs +++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs @@ -518,7 +518,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation } var fileWriter = new FileOutputWriter(GetOutputDirectory(fullFileName)); - var runsFactory = _simFactoryFactory.Factory(mode, input, fileWriter); + var runsFactory = _simFactoryFactory.Factory(mode, input, fileWriter, null, null); //var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, input, fileWriter); runsFactory.WriteModalResults = Settings.Default.WriteModalResults; runsFactory.ModalResults1Hz = Settings.Default.ModalResults1Hz; diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs index cab099207f1e34c5edd8483e0625ebc2944d1c00..0e4fa28a6e30b84d0ac70e629f8d739340545ad8 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs @@ -203,7 +203,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation var inputData = new XMLDeclarationVIFInputData(vifData.MultistageJobInputData, vifData.VehicleInputData); - var factory = _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, writer); + var factory = _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, writer, null, null); //var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer); FileHelper.CreateDirectory(outputFile); diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs index 7af3dd2e2c22ea290fe667a63c4259b20ff7de66..a3b973cece77d621addb072cb06f3f486f5814a8 100644 --- a/VectoConsole/Program.cs +++ b/VectoConsole/Program.cs @@ -236,7 +236,7 @@ Examples: } fileWriter = new FileOutputWriter(file); - var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter); + var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter, null, null); //var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, dataProvider, fileWriter); runsFactory.ModalResults1Hz = args.Contains("-1Hz"); runsFactory.WriteModalResults = args.Contains("-mod");