diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/MediumLorryRunDataFactory/DeclarationModeMediumLorryRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/MediumLorryRunDataFactory/DeclarationModeMediumLorryRunDataFactory.cs deleted file mode 100644 index b255429f7803558c82e85ca4db9c6e7daedf3962..0000000000000000000000000000000000000000 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/MediumLorryRunDataFactory/DeclarationModeMediumLorryRunDataFactory.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.PrimaryBus; -using TUGraz.VectoCore.Models.Simulation.Data; - -namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.MediumLorryRunDataFactory -{ - internal abstract class DeclarationModeMediumLorryRunDataFactory - { - public abstract class MediumLorryBase : IVectoRunDataFactory - { - #region Implementation of IVectoRunDataFactory - - public IEnumerable<VectoRunData> NextRun() - { - throw new NotImplementedException(); - } - - #endregion - } - - public class Conventional : MediumLorryBase - { - - } - - public class HEV_S2 : MediumLorryBase - { - - } - - public class HEV_S3 : MediumLorryBase - { - - } - - - public class HEV_S4 : MediumLorryBase - { - - } - - - - - } -} diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv index 284398d7e6fa50e348d874d38f83dbf57c713d22..9ac950f7b3655f297d5d1b4262efa673c609e9c9 100644 --- a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv +++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv @@ -2,6 +2,7 @@ Technology ,conventional ,P-HEV ,S-HEV ,PEV ,fully e Fixed displacement , 1 , 1 , 1 , 0 , 0 ,1 ,1 ,1 Fixed displacement with elec. control , 1 , 1 , 1 , 0 , 0 ,0.95 ,1 ,1 Dual displacement , 1 , 1 , 1 , 0 , 0 ,0.85 ,0.85 ,0.85 +Dual displacement with elec. control , 1 , 1 , 1 , 0 , 0 ,0.85 ,0.85 ,0.85 Variable displacement mech. controlled , 1 , 1 , 1 , 0 , 0 ,0.75 ,0.75 ,0.75 Variable displacement elec. controlled , 1 , 1 , 1 , 0 , 0 ,0.6 ,0.6 ,0.6 Electric , 1 , 1 , 1 , 0 , 0 ,0 ,2.143 ,1.429