added additional test case, changed SimulatorFactory

VectoConsole/Program.cs

@@ -67,8 +67,7 @@ Examples:
 				var jobContainer = new JobContainer(sumWriter);
 
 				foreach (var file in fileList.Where(f => Path.GetExtension(f) == Constants.FileExtensions.VectoJobFile)) {
-					var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineeringMode);
-					runsFactory.DataReader.SetJobFile(file);
+					var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineeringMode, file);
 					jobContainer.AddRuns(runsFactory);
 				}
 

VectoCore/Models/Simulation/Impl/SimulatorFactory.cs

 using System.Collections.Generic;
 using System.IO;
+using NLog;
 using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Exceptions;
 using TUGraz.VectoCore.FileIO.Reader;
 using TUGraz.VectoCore.FileIO.Reader.Impl;
 using TUGraz.VectoCore.Models.Simulation.Data;
@@ -20,7 +22,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 		private FactoryMode _mode;
 
-		public SimulatorFactory(FactoryMode mode)
+		public SimulatorFactory(FactoryMode mode, string jobFile)
 		{
 			JobNumber = 0;
 			_mode = mode;
@@ -34,7 +36,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 				case FactoryMode.EngineOnlyMode:
 					DataReader = new EngineOnlySimulationDataReader();
 					break;
+				default:
+					throw new VectoException("Unkown factory mode in SimulatorFactory: {0}", mode);
 			}
+			DataReader.SetJobFile(jobFile);
 		}
 
 		///// <summary>

VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs

@@ -312,8 +312,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public class DrivingCycleState
 		{
-			public DrivingCycleState() {}
-
 			public DrivingCycleState Clone()
 			{
 				return new DrivingCycleState {

VectoCore/VectoCore.csproj

@@ -78,6 +78,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JetBrains.Annotations">
+      <HintPath>..\packages\JetBrains.Annotations.9.2.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

VectoCore/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 
 <packages>
+  <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NLog" version="4.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file

VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs

@@ -234,6 +234,22 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 			Assert.IsInstanceOfType(response, typeof(ResponseCycleFinished));
 		}
 
+		[TestMethod]
+		public void Test_FullPowerTrain_JobFile()
+		{
+			var sumWriter = new SummaryFileWriter(@"job.vsum");
+			var jobContainer = new JobContainer(sumWriter);
+
+			var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineeringMode, @"TestData\job.vecto");
+
+			jobContainer.AddRuns(factory);
+			jobContainer.Execute();
+
+			ResultFileHelper.TestSumFile(@"TestData\Results\Integration\job.vsum", @"job.vsum");
+
+			ResultFileHelper.TestModFile(@"TestData\Results\Integration\job.vmod", @"TestData\Jobs\job.vmod");
+		}
+
 
 		// todo: add realistic FullLoadCurve
 		private static GearboxData CreateGearboxData()

VectoCoreTest/Models/Simulation/AuxTests.cs

@@ -273,8 +273,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var sumWriter = new SummaryFileWriter(@"AuxReadJobFileDeclarationMode.vsum");
 			var jobContainer = new JobContainer(sumWriter);
 
-			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode);
-			runsFactory.DataReader.SetJobFile(@"TestData\Jobs\40t_Long_Haul_Truck.vecto");
+			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode, @"TestData\Jobs\40t_Long_Haul_Truck.vecto");
 
 			jobContainer.AddRuns(runsFactory);
 			jobContainer.Execute();
@@ -289,8 +288,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var sumWriter = new SummaryFileWriter(@"AuxReadJobFileEngineeringMode.vsum");
 			var jobContainer = new JobContainer(sumWriter);
 
-			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineeringMode);
-			runsFactory.DataReader.SetJobFile(@"TestData\Jobs\24t Coach.vecto");
+			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineeringMode, @"TestData\Jobs\24t Coach.vecto");
 
 			jobContainer.AddRuns(runsFactory);
 			jobContainer.Execute();

VectoCoreTest/Models/Simulation/SimulationTests.cs

@@ -63,9 +63,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var dataWriter = new ModalDataWriter(resultFileName, SimulatorFactory.FactoryMode.EngineOnlyMode);
 			var sumWriter = new SummaryFileWriter(sumFileName);
 
-			var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode) { SumWriter = sumWriter };
-			factory.DataReader.SetJobFile(EngineOnlyJob);
-
+			var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, EngineOnlyJob) { SumWriter = sumWriter };
+			
 			return factory.SimulationRuns().First();
 		}
 
@@ -75,8 +74,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			var sumWriter = new SummaryFileWriter(@"24t Coach.vsum");
 			var jobContainer = new JobContainer(sumWriter);
 
-			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode);
-			runsFactory.DataReader.SetJobFile(@"TestData\Jobs\24t Coach EngineOnly.vecto");
+			var runsFactory = new SimulatorFactory(SimulatorFactory.FactoryMode.EngineOnlyMode, @"TestData\Jobs\24t Coach EngineOnly.vecto");
 
 			jobContainer.AddRuns(runsFactory);
 			jobContainer.Execute();

VectoCoreTest/TestData/job.vecto

+{
+  "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.vgbx",
+    "Cycles": [
+      "Cycles\\1-Gear-Test-dist.vdri"
+    ],
+    "Aux": [],
+    "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

VectoCoreTest/VectoCoreTest.csproj

@@ -200,6 +200,9 @@
     <None Include="TestData\Components\Retarder.vrlm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestData\Cycles\1-Gear-Test-dist.vdri">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Cycles\Coach time based short.vdri">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -325,6 +328,9 @@
     <None Include="TestData\Integration\FullPowerTrain\unlimited.vacc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestData\job.vecto">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Integration\MinimalPowerTrain\1-Gear-StopTest-dist.vdri">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>