diff --git a/LicenceHeader/Program.cs b/LicenceHeader/Program.cs index 5b2c255de721af5abb42aacf032dd0e8de52fbb4..4909d4915d30ddf4d13f1f19369e63eaf30c6db3 100644 --- a/LicenceHeader/Program.cs +++ b/LicenceHeader/Program.cs @@ -51,7 +51,8 @@ namespace LicenceHeader Console.ResetColor(); Console.WriteLine(); Console.WriteLine("Search Directory: {0}", Path.GetFullPath(SolutionRootDirectory)); - Console.WriteLine("Filter: *.cs, Excluded Dirs: \\obj, \\bin"); + Console.WriteLine("Filter: *.cs"); + Console.WriteLine("Excluded Dirs: \\obj, \\bin"); Console.WriteLine("Header-File: {0}", Path.GetFullPath("header.txt")); var licence = File.ReadAllText("header.txt", Encoding.UTF8); diff --git a/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx b/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx new file mode 100644 index 0000000000000000000000000000000000000000..295e64ea33764cea7fa47b5b7f6527ee3cea9cfa --- /dev/null +++ b/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx @@ -0,0 +1,90 @@ +{ + "Header": { + "CreatedBy": " ()", + "Date": "8/21/2015 10:16:31 AM", + "AppVersion": "2.2 beta-2", + "FileVersion": 5 + }, + "Body": { + "SavedInDeclMode": false, + "ModelName": "Generic 24t Coach", + "Inertia": 0.0, + "TracInt": 1.0, + "Gears": [ + { + "Ratio": 3.240355, + "LossMap": "Axle.vtlm" + }, + { + "Ratio": 6.38, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 4.63, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 3.44, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 2.59, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 1.86, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 1.35, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 1.0, + "LossMap": "Direct Gear.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + }, + { + "Ratio": 0.76, + "LossMap": "Indirect Gear_smallRange.vtlm", + "TCactive": false, + "ShiftPolygon": "ShiftPolygons.vgbs", + "FullLoadCurve": "<NOFILE>" + } + ], + "TqReserve": 20.0, + "SkipGears": true, + "ShiftTime": 2, + "EaryShiftUp": true, + "StartTqReserve": 20.0, + "StartSpeed": 2.0, + "StartAcc": 0.6, + "GearboxType": "AMT", + "TorqueConverter": { + "Enabled": false, + "File": "<NOFILE>", + "RefRPM": 0.0, + "Inertia": 0.0 + } + } +} \ No newline at end of file diff --git a/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm b/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..3d3bbb662e7eaa97e84fafbfadb2d3d3f300f311 --- /dev/null +++ b/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm @@ -0,0 +1,5 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-] +0,50,6.06, +0,250,10.06, +200,50,7.072, +200,250,11.072 \ No newline at end of file diff --git a/VectoCoreTest/TestData/Jobs/24t Coach_smallLossMap.vecto b/VectoCoreTest/TestData/Jobs/24t Coach_smallLossMap.vecto new file mode 100644 index 0000000000000000000000000000000000000000..912cc74f0c7f86b8483bf2fbe8a5903bc52922c9 --- /dev/null +++ b/VectoCoreTest/TestData/Jobs/24t Coach_smallLossMap.vecto @@ -0,0 +1,56 @@ +{ + "Header": { + "CreatedBy": " ()", + "Date": "3/4/2015 2:09:13 PM", + "AppVersion": "2.0.4-beta3", + "FileVersion": 2 + }, + "Body": { + "SavedInDeclMode": false, + "VehicleFile": "../Components/24t Coach.vveh", + "EngineFile": "../Components/24t Coach.veng", + "GearboxFile": "../Components/24t Coach_smallLossMap.vgbx", + "Cycles": [ + "../Cycles/Coach_24t_xshort.vdri" + ], + "Aux": [ + { + "ID": "ALT1", + "Type": "Alternator", + "Path": "../Components/24t_Coach_ALT.vaux", + "Technology": "" + }, + { + "ID": "ALT2", + "Type": "Alternator", + "Path": "../Components/24t_Coach_ALT.vaux", + "Technology": "" + }, + { + "ID": "ALT3", + "Type": "Alternator", + "Path": "../Components/24t_Coach_ALT.vaux", + "Technology": "" + } + ], + "VACC": "../Components/Coach.vacc", + "EngineOnlyMode": false, + "StartStop": { + "Enabled": false, + "MaxSpeed": 5.0, + "MinTime": 0.0, + "Delay": 0 + }, + "LAC": { + "Enabled": true, + "Dec": -0.5, + "MinSpeed": 50.0 + }, + "OverSpeedEcoRoll": { + "Mode": "OverSpeed", + "MinSpeed": 70.0, + "OverSpeed": 5.0, + "UnderSpeed": 5.0 + } + } +} \ No newline at end of file