use more explicit condition to decide if PTO is active

VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs

@@ -269,7 +269,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 					Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTOTransmission);
 
 				aux.Add(Constants.Auxiliaries.IDs.PTOConsumer,
-					n => container.CycleData.LeftSample.PTOActive ? null : data.PTO.LossMap.GetTorqueLoss(n) * n);
+					n => container.PTOActive ? null : data.PTO.LossMap.GetTorqueLoss(n) * n);
 				container.ModalData.AddAuxiliary(Constants.Auxiliaries.IDs.PTOConsumer,
 					Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTOConsumer);
 			}

VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs

@@ -406,6 +406,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 			get { return DrivingCycle.CycleData; }
 		}
 
+		public bool PTOActive
+		{
+			get { return DrivingCycle.PTOActive; }
+		}
+
 		public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
 		{
 			return DrivingCycle.CycleLookAhead(distance);

VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs

@@ -46,6 +46,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
 		/// </summary>
 		CycleData CycleData { get; }
 
+		bool PTOActive { get; }
+
 		/// <summary>
 		/// get a single driving-cycle entry at a certain distance ahead
 		/// altitude is interpolated between sampling points, slope is averaged

VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs

@@ -208,8 +208,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				case 3:
 					CurrentState.WaitPhase++;
 					IdleController.ActivateIdle();
+					PTOActive = false;
 					return Left.StoppingTime / 2;
 				case 2:
+					PTOActive = true;
 					IdleController.ActivatePTO();
 					return IdleController.GetNextCycleTime();
 			}
@@ -223,6 +225,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 				case 5:
 					CurrentState.WaitPhase++;
 					IdleController.ActivateIdle();
+					PTOActive = false;
 					return Constants.SimulationSettings.TargetTimeInterval;
 				case 3:
 				case 7:
@@ -233,6 +236,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					CurrentState.WaitPhase++;
 					return Left.StoppingTime / 2 - 2 * Constants.SimulationSettings.TargetTimeInterval;
 				case 4:
+					PTOActive = true;
 					IdleController.ActivatePTO();
 					return IdleController.GetNextCycleTime();
 			}
@@ -455,6 +459,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 		}
 
+		public bool PTOActive { get; private set; }
+
 		public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
 		{
 			var absDistance = CurrentState.Distance + distance;

VectoCore/VectoCore/Models/SimulationComponent/Impl/IdleControllerSwitcher.cs

@@ -32,6 +32,7 @@
 using System;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.Models.Connector.Ports;
 using TUGraz.VectoCore.OutputData;
 
@@ -65,8 +66,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public ITnOutPort RequestPort
 		{
-			set
-			{
+			set {
 				_idleController.RequestPort = value;
 				_ptoController.RequestPort = value;
 			}
@@ -103,8 +103,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public Second Duration
 		{
-			get
-			{
+			get {
 				if (_ptoController != null) {
 					return _ptoController.Duration;
 				}

VectoCore/VectoCore/Models/SimulationComponent/Impl/MeasuredSpeedDrivingCycle.cs

@@ -307,6 +307,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 		}
 
+		public bool PTOActive
+		{
+			get { return false; }
+		}
+
 		public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
 		{
 			return new DrivingCycleData.DrivingCycleEntry(CycleIterator.RightSample);

VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs

@@ -183,6 +183,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 		}
 
+		public bool PTOActive
+		{
+			get { return true; }
+		}
+
 		public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
 		{
 			return new DrivingCycleData.DrivingCycleEntry() {

VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs

@@ -63,8 +63,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public CycleData CycleData
 		{
-			get
-			{
+			get {
 				return new CycleData {
 					AbsTime = 0.SI<Second>(),
 					AbsDistance = 0.SI<Meter>(),
@@ -74,6 +73,8 @@ namespace TUGraz.VectoCore.Tests.Utils
 			}
 		}
 
+		public bool PTOActive { get; set; }
+
 		public DrivingCycleData.DrivingCycleEntry CycleLookAhead(Meter distance)
 		{
 			return new DrivingCycleData.DrivingCycleEntry() {

VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs

@@ -190,6 +190,8 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public VectoRun.Status RunStatus { get; set; }
 
+		public bool PTOActive { get; private set; }
+
 		public void AddComponent(VectoSimulationComponent component)
 		{
 			Components.Add(component);