Merge remote-tracking branch...
Merge remote-tracking branch 'quaritsch/feature/VECTO-125-comparison-of-vecto2.2-and-vecto3' into feature/VECTO-134-add-start-button-for-v3-into-gui Conflicts: VectoCore/Models/SimulationComponent/Impl/Driver.cs
Showing
- VECTO/GUI/F_MAINForm.vb 11 additions, 21 deletionsVECTO/GUI/F_MAINForm.vb
- VectoConsole/App.config 22 additions, 20 deletionsVectoConsole/App.config
- VectoConsole/Program.cs 41 additions, 1 deletionVectoConsole/Program.cs
- VectoCore/FileIO/Reader/DrivingCycleDataReader.cs 4 additions, 12 deletionsVectoCore/FileIO/Reader/DrivingCycleDataReader.cs
- VectoCore/Models/Connector/Ports/ISimulationPort.cs 1 addition, 0 deletionsVectoCore/Models/Connector/Ports/ISimulationPort.cs
- VectoCore/Models/Simulation/Data/ModalResult.cs 2 additions, 0 deletionsVectoCore/Models/Simulation/Data/ModalResult.cs
- VectoCore/Models/Simulation/IVectoRun.cs 5 additions, 1 deletionVectoCore/Models/Simulation/IVectoRun.cs
- VectoCore/Models/Simulation/Impl/DistanceRun.cs 1 addition, 0 deletionsVectoCore/Models/Simulation/Impl/DistanceRun.cs
- VectoCore/Models/Simulation/Impl/JobContainer.cs 109 additions, 6 deletionsVectoCore/Models/Simulation/Impl/JobContainer.cs
- VectoCore/Models/Simulation/Impl/VectoRun.cs 18 additions, 1 deletionVectoCore/Models/Simulation/Impl/VectoRun.cs
- VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs 1 addition, 1 deletion...Core/Models/SimulationComponent/Data/AccelerationCurve.cs
- VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs 14 additions, 7 deletions.../Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
- VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs 15 additions, 0 deletions...els/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
- VectoCore/Models/SimulationComponent/Impl/Driver.cs 6 additions, 4 deletionsVectoCore/Models/SimulationComponent/Impl/Driver.cs
- VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs 5 additions, 0 deletions...Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
- VectoCore/Models/SimulationComponent/Impl/Gearbox.cs 2 additions, 1 deletionVectoCore/Models/SimulationComponent/Impl/Gearbox.cs
- VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs 5 additions, 0 deletions.../Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs
- VectoCore/Utils/DoubleExtensionMethods.cs 4 additions, 2 deletionsVectoCore/Utils/DoubleExtensionMethods.cs
- VectoCore/Utils/Formulas.cs 2 additions, 2 deletionsVectoCore/Utils/Formulas.cs
- VectoCore/Utils/IntExtensionMethods.cs 4 additions, 2 deletionsVectoCore/Utils/IntExtensionMethods.cs
Loading
Please register or sign in to comment