adding another lookup table

VectoCore/VectoCore/InputData/Reader/ShiftStrategy/ShareIdleLowReader.cs

@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ShiftStrategy
 		}
 
 		
-		private class Fields
+		public static class Fields
 		{
 			public const string Velocity = "velocity";
 			public const string WeightingFactor = "weighting factor";

VectoCore/VectoCore/InputData/Reader/ShiftStrategy/ShareTorque99lLookupReader.cs

+using System.IO;
+using System.Linq;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ShiftStrategy
+{
+	public class ShareTorque99lLookupReader
+	{
+		public static ShareTorque99lLookup ReadFromStream(Stream stream)
+		{
+			return Create(VectoCSVFile.ReadStream(stream));
+		}
+
+		private static ShareTorque99lLookup Create(TableData data)
+		{
+			return new ShareTorque99lLookup(
+				new LookupDataReader<MeterPerSecond, double>("Share T_99l", new[] { Fields.Velocity, Fields.ShareT99l })
+					.Create(data, x => x.ParseDouble(Fields.Velocity).KMPHtoMeterPerSecond(), y => y.ParseDouble(Fields.ShareT99l))
+					.OrderBy(x => x.Key).ToArray());
+		}
+
+		public static class Fields
+		{
+			public const string Velocity = "v";
+			public const string ShareT99l = "share T_99l";
+		}
+	}
+}

VectoCore/VectoCore/Models/SimulationComponent/Data/ShiftStrategy/ShareTorque99lLookup.cs

+using System.Collections.Generic;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.InputData.Reader.ShiftStrategy {
+	public class ShareTorque99lLookup
+	{
+		private KeyValuePair<MeterPerSecond, double>[] _entries;
+
+		public ShareTorque99lLookup(KeyValuePair<MeterPerSecond, double>[] entries)
+		{
+			_entries = entries;
+		}
+
+		public double Lookup(MeterPerSecond velocity)
+		{
+			return _entries.Interpolate(x => x.Key.Value(), y => y.Value, velocity.Value());
+		}
+	}
+}
\ No newline at end of file

VectoCore/VectoCore/Resources/Declaration/GearshiftParameters/ShareTq99L.csv

+v [km/h] , share T_99L
+  0		 ,  0.6
+ 10		 ,  0.6
+ 20		 ,  0.8
+ 30		 ,  1.0
+ 40		 ,  1.0
+ 50		 ,  1.0
+ 60		 ,  1.0
+ 70		 ,  1.0
+ 80		 ,  1.0
+ 90		 ,  1.0
+100		 ,  1.0
\ No newline at end of file

VectoCore/VectoCore/VectoCore.csproj

@@ -163,7 +163,16 @@
     <Compile Include="InputData\Reader\Impl\EngineeringModeVectoRunDataFactory.cs" />
     <Compile Include="InputData\Reader\Impl\EngineOnlyVectoRunDataFactory.cs" />
     <Compile Include="InputData\Reader\ShiftPolygonReader.cs" />
+    <Compile Include="Models\SimulationComponent\Data\ShiftStrategy\ShareTorque99lLookup.cs" />
+    <Compile Include="InputData\Reader\ShiftStrategy\ShareTorque99lLookupReader.cs" />
+    <Compile Include="Models\SimulationComponent\Data\ShiftStrategy\AccelerationReserveLookup.cs" />
+    <Compile Include="InputData\Reader\ShiftStrategy\AccelerationReserveLookupReader.cs" />
+    <Compile Include="Models\SimulationComponent\Data\ShiftStrategy\EngineSpeedHighFactorLookup.cs" />
+    <Compile Include="InputData\Reader\ShiftStrategy\EngineSpeedHighLookupReader.cs" />
+    <Compile Include="InputData\Reader\ShiftStrategy\LookupDataReader.cs" />
     <Compile Include="InputData\Reader\ShiftStrategy\PredictionDurationLookupReader.cs" />
+    <Compile Include="Models\SimulationComponent\Data\ShiftStrategy\ShareIdleLowLookup.cs" />
+    <Compile Include="InputData\Reader\ShiftStrategy\ShareIdleLowReader.cs" />
     <Compile Include="Models\Declaration\AuxDemandEntry.cs" />
     <Compile Include="Models\Declaration\AuxiliaryTypeHelper.cs" />
     <Compile Include="Models\Connector\Ports\IDriverDemandPort.cs" />
@@ -467,6 +476,10 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Declaration\GearshiftParameters\PredictionTimeLookup.csv" />
+    <EmbeddedResource Include="Resources\Declaration\GearshiftParameters\AccelerationReserveLookup.csv" />
+    <EmbeddedResource Include="Resources\Declaration\GearshiftParameters\ShareEngineSpeedHigh.csv" />
+    <EmbeddedResource Include="Resources\Declaration\GearshiftParameters\ShareIdleLow.csv" />
+    <EmbeddedResource Include="Resources\Declaration\GearshiftParameters\ShareTq99L.csv" />
     <None Include="Utils\VectoVersionCore.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>VectoVersionCore.cs</LastGenOutput>

VectoCore/VectoCoreTest/Models/SimulationComponentData/ShiftstrategyParameterTests.cs

@@ -91,5 +91,21 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 
 			Assert.AreEqual(expected, val.Value(), 1e-6);
 		}
+
+		[TestCase(0, 0.6),
+			TestCase(20, 0.8),
+			TestCase(30, 1.0),
+			TestCase(110, 1.0),
+			TestCase(15, 0.7),
+			TestCase(25, 0.9),]
+		public void TestShareTq99l(double velcoity, double expected)
+		{
+			var lookup = ShareTorque99lLookupReader.ReadFromStream(
+				RessourceHelper.ReadStream(
+					DeclarationData.DeclarationDataResourcePrefix + ".GearshiftParameters.ShareTq99L.csv"));
+			var val = lookup.Lookup(velcoity.KMPHtoMeterPerSecond());
+
+			Assert.AreEqual(expected, val, 1e-6);
+		}
 	}
 }