Merge branch 'develop' into feature/VECTO-1648-BusAux-adaptations
# Conflicts: # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs # VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs # VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs # VectoCore/VectoCore/OutputData/IModalDataContainer.cs # VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs # VectoCore/VectoCore/OutputData/SummaryDataContainer.cs # VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto # VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml # VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
Showing
- .gitattributes 1 addition, 1 deletion.gitattributes
- .mailmap 18 additions, 0 deletions.mailmap
- CHANGES.md 1132 additions, 17 deletionsCHANGES.md
- Documentation/GUI Source/Source.pptx 0 additions, 0 deletionsDocumentation/GUI Source/Source.pptx
- Documentation/User Manual Source/Release Notes Vecto3.x.pdf 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pdf
- Documentation/User Manual Source/Release Notes Vecto3.x.pptx 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pptx
- Documentation/User Manual/1-user-interface/0_start.md 1 addition, 1 deletionDocumentation/User Manual/1-user-interface/0_start.md
- Documentation/User Manual/1-user-interface/B_mainform.md 4 additions, 4 deletionsDocumentation/User Manual/1-user-interface/B_mainform.md
- Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md 8 additions, 8 deletions...ation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
- Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md 1 addition, 1 deletion...ntation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
- Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md 21 additions, 18 deletions...tation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
- Documentation/User Manual/1-user-interface/F_VEH-Editor.md 10 additions, 10 deletionsDocumentation/User Manual/1-user-interface/F_VEH-Editor.md
- Documentation/User Manual/1-user-interface/G_ENG-Editor.md 5 additions, 5 deletionsDocumentation/User Manual/1-user-interface/G_ENG-Editor.md
- Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md 5 additions, 5 deletions...Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
- Documentation/User Manual/1-user-interface/H_GBX-Editor.md 18 additions, 13 deletionsDocumentation/User Manual/1-user-interface/H_GBX-Editor.md
- Documentation/User Manual/1-user-interface/I_Graph.md 1 addition, 1 deletionDocumentation/User Manual/1-user-interface/I_Graph.md
- Documentation/User Manual/1-user-interface/L_ElectricMotor.md 3 additions, 3 deletions...mentation/User Manual/1-user-interface/L_ElectricMotor.md
- Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md 11 additions, 5 deletions...ation/User Manual/1-user-interface/M_BatteryPackEditor.md
- Documentation/User Manual/1-user-interface/N_IEPC.md 11 additions, 11 deletionsDocumentation/User Manual/1-user-interface/N_IEPC.md
- Documentation/User Manual/1-user-interface/O_IHPC.md 10 additions, 14 deletionsDocumentation/User Manual/1-user-interface/O_IHPC.md
Loading
Please register or sign in to comment