Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-83-adapt-engine-only-simulation-for

Conflicts:
	VectoCore/Models/Connector/Ports/Impl/Response.cs
	VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Models/SimulationComponent/Impl/EngineOnlyDrivingCycle.cs
	VectoCore/Utils/SI.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/VectoCoreTest.csproj

VECTO.sln.DotSettings

@@ -16,7 +16,10 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">LINE_BREAK</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SI/@EntryIndexedValue">SI</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=2BF7A1E51991F2458D2D1F0B29CF888B/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=2BF7A1E51991F2458D2D1F0B29CF888B/AbsolutePath/@EntryValue">C:\Workspaces\VisualStudio\VECTO_quam\VECTO.sln.DotSettings</s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File2BF7A1E51991F2458D2D1F0B29CF888B/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File2BF7A1E51991F2458D2D1F0B29CF888B/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File2BF7A1E51991F2458D2D1F0B29CF888B/RelativePriority/@EntryValue">1</s:Double>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

VectoCore/Models/Connector/Connector.cs

-using TUGraz.VectoCore.Models.Connector.Ports.Impl;
-
-namespace TUGraz.VectoCore.Models.Connector
-{
-	internal class Connector<TI, TO, TP>
-		where TI : InPort, TP
-		where TO : OutPort, TP
-	{
-		protected TI InPort;
-		protected TO OutPort;
-
-		public void Connect(TI inPort, TO outPort)
-		{
-			InPort = inPort;
-			OutPort = outPort;
-
-			InPort.Connect(OutPort);
-		}
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandInPort.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IDriverDemandInPort
-	{
-		void Connect(IDriverDemandOutPort other);
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandInProvider.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IDriverDemandInProvider
-	{
-		IDriverDemandInPort InPort();
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandOutPort.cs

-using System;
-using TUGraz.VectoCore.Utils;
-
-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IDriverDemandOutPort
-	{
-		IResponse Request(TimeSpan absTime, TimeSpan dt, MeterPerSecond velocity, double gradient);
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandOutProvider.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IDriverDemandOutProvider
-	{
-		IDriverDemandOutPort OutPort();
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandPort.cs

+using System;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a connect method to connect the inport to an outport.
+    /// </summary>
+    public interface IDriverDemandInPort
+    {
+        /// <summary>
+        /// Connects the inport to another outport.
+        /// </summary>
+        void Connect(IDriverDemandOutPort other);
+    }
+
+    /// <summary>
+    /// Defines a request method for a DriverDemand-Out-Port.
+    /// </summary>
+    public interface IDriverDemandOutPort
+    {
+        /// <summary>
+        /// Requests the Outport with the given velocity [m/s] and road gradient [rad].
+        /// </summary>
+        /// <param name="absTime">[s]</param>
+        /// <param name="dt">[s]</param>
+        /// <param name="velocity">[m/s]</param>
+        /// <param name="gradient">[rad]</param>
+        IResponse Request(TimeSpan absTime, TimeSpan dt, MeterPerSecond velocity, Radian gradient);
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDriverDemandProvider.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a method to acquire an DriverDemand in port.
+    /// </summary>
+    public interface IDriverDemandInProvider
+    {
+        /// <summary>
+        /// Returns the inport to connect it to another outport.
+        /// </summary>
+        /// <returns></returns>
+        IDriverDemandInPort InPort();
+    }
+
+    /// <summary>
+    /// Defines a method to acquire an DriverDemand out port.
+    /// </summary>
+    public interface IDriverDemandOutProvider
+    {
+        /// <summary>
+        /// Returns the outport to send requests to.
+        /// </summary>
+        /// <returns></returns>
+        IDriverDemandOutPort OutPort();
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs

+using System;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a method to request the outport.
+    /// </summary>
+    public interface IDrivingCycleOutPort
+    {
+        /// <summary>
+        /// Requests a demand for a specific absolute time and a time interval dt.
+        /// </summary>
+        /// <param name="absTime">The absolute time of the simulation.</param>
+        /// <param name="dt">The current time interval.</param>
+        /// <returns></returns>
+        IResponse Request(TimeSpan absTime, TimeSpan dt);
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IDrivingCycleProvider.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a method to acquire an DriverCycle Demand out port.
+    /// </summary>
+    public interface IDrivingCycleOutProvider
+    {
+        /// <summary>
+        /// Returns the outport to send requests to.
+        /// </summary>
+        /// <returns></returns>
+        IDrivingCycleOutPort OutPort();
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IFvPort.cs

+using System;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a connect method to connect the inport to an outport.
+    /// </summary>
+    public interface IFvInPort
+    {
+        /// <summary>
+        /// Connects the inport to another outport.
+        /// </summary>
+        void Connect(IFvOutPort other);
+    }
+
+    /// <summary>
+    /// Defines a request method for a Fv-Out-Port.
+    /// </summary>
+    public interface IFvOutPort
+    {
+        /// <summary>
+        /// Requests the Outport with the given force [N] and vehicle velocity [m/s].
+        /// </summary>
+        /// <param name="absTime">[s]</param>
+        /// <param name="dt">[s]</param>
+        /// <param name="force">[N]</param>
+        /// <param name="velocity">[m/s]</param>
+        IResponse Request(TimeSpan absTime, TimeSpan dt, Newton force, MeterPerSecond velocity);
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IInPort.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IInPort {}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IInShaft.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IInShaft
-	{
-		ITnInPort InShaft();
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IOutPort.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IOutPort {}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IOutShaft.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface IOutShaft
-	{
-		ITnOutPort OutShaft();
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IResponse.cs

 namespace TUGraz.VectoCore.Models.Connector.Ports
 {
-	public interface IResponse {}
+    /// <summary>
+    /// Defines an interface for a Response.
+    /// </summary>
+    public interface IResponse {}
 }
\ No newline at end of file

VectoCore/Models/Connector/Ports/IRoadPortProvider.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a method to acquire an Fv in port.
+    /// </summary>
+    public interface IRoadPortInProvider
+    {
+        /// <summary>
+        /// Returns the inport to connect it to another outport.
+        /// </summary>
+        /// <returns></returns>
+        IFvInPort InPort();
+    }
+
+    /// <summary>
+    /// Defines a method to acquire an Fv out port.
+    /// </summary>
+    public interface IRoadPortOutProvider
+    {
+        /// <summary>
+        /// Returns the outport to send requests to.
+        /// </summary>
+        /// <returns></returns>
+        IFvOutPort OutPort();
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/IShaft.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+    /// <summary>
+    /// Defines a method to acquire an Tn in port.
+    /// </summary>
+    public interface IInShaft
+    {
+        /// <summary>
+        /// Returns the inport to connect it to another outport.
+        /// </summary>
+        /// <returns></returns>
+        ITnInPort InShaft();
+    }
+
+    /// <summary>
+    /// Defines a method to acquire an Tn out port.
+    /// </summary>
+    public interface IOutShaft
+    {
+        /// <summary>
+        /// Returns the outport to send requests to.
+        /// </summary>
+        /// <returns></returns>
+        ITnOutPort OutShaft();
+    }
+}
\ No newline at end of file

VectoCore/Models/Connector/Ports/ITnInPort.cs

-namespace TUGraz.VectoCore.Models.Connector.Ports
-{
-	public interface ITnInPort : ITnPort, IInPort
-	{
-		void Connect(ITnOutPort other);
-	}
-}
\ No newline at end of file

VectoCore/Models/Connector/Ports/ITnOutPort.cs

@@ -12,6 +12,6 @@ namespace TUGraz.VectoCore.Models.Connector.Ports
 		/// <param name="dt">[s]</param>
 		/// <param name="torque">[Nm]</param>
 		/// <param name="angularVelocity">[rad/s]</param>
-		IResponse Request(TimeSpan absTime, TimeSpan dt, NewtonMeter torque, RadianPerSecond angularVelocity);
+		IResponse Request(TimeSpan absTime, TimeSpan dt, NewtonMeter torque, PerSecond angularVelocity);
 	}
 }
\ No newline at end of file