reading further model parameters from file

VectoCore/VectoCore/InputData/FileIO/JSON/BusAuxiliaryInputData.cs

@@ -78,7 +78,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 				.GetEx<double>("AverageCurrentDemandWithoutBaseLoad").SI<Ampere>();
 
 			// PowerNetVoltage
-			//electricalUserInputsConfig.PowerNetVoltage = elData.GetEx<double>("PowerNetVoltage").SI<Volt>();
+			electricalUserInputsConfig.PowerNetVoltage = elData.GetEx<double>("PowerNetVoltage").SI<Volt>();
 
 
 			// SmartElectrical

VectoCore/VectoCore/InputData/FileIO/JSON/SSMInputData.cs

@@ -51,6 +51,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			retVal.BusWindowSurface = genInput.GetEx<double>("BC_BusWindowSurfaceArea").SI<SquareMeter>();
 			retVal.BusVolume = genInput.GetEx<double>("BC_BusVolume").SI<CubicMeter>();
 			retVal.UValue = genInput.GetEx<double>("BC_UValue").SI<WattPerKelvinSquareMeter>();
+			retVal.NumberOfPassengers = genInput.GetEx<double>("BC_PassengerCount");
 			retVal.COP = genInput.GetEx<double>("BC_COP");
 			//retVal.GCVDieselOrHeatingOil = genInput.GetEx<double>("BC_GCVDieselOrHeatingOil").SI(Unit.SI.Kilo.Watt.Hour.Per.Kilo.Gramm).Cast<JoulePerKilogramm>();
 																										//retVal.MaxTemperatureDeltaForLowFloorBusses = genInput.GetEx<double>("BC_MaxTemperatureDeltaForLowFloorBusses").SI<Kelvin>();

VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/ResultCard.cs

@@ -26,6 +26,8 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
 			return 0.SI<Ampere>();
 		}
 
+		public Dictionary<Ampere, Ampere> Entries { get { return new Dictionary<Ampere, Ampere>();} }
+
 		#endregion
 	}
 
@@ -58,6 +60,11 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
 			return GetOrInterpolate(Amps);
 		}
 
+		public Dictionary<Ampere, Ampere> Entries
+		{
+			get { return _results.ToDictionary(x => x.Amps, x => x.SmartAmps); }
+		}
+
 
 		// Helpers
 		/// <summary>

VectoCore/VectoCore/OutputData/FileIO/BusAuxWriter.cs

@@ -79,10 +79,10 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 
 			// ResultCardIdle
 			var resultCard = new List<object>();
-			foreach (var result in ((ResultCard)electricalUserCfg.ResultCardIdle).Results) {
+			foreach (var result in electricalUserCfg.ResultCardIdle.Entries) {
 				resultCard.Add(new Dictionary<string, object>() {
-					{ "Amps",  result.Amps.Value()},
-					{"SmartAmps",result.SmartAmps.Value() }
+					{ "Amps",  result.Key.Value()},
+					{"SmartAmps",result.Value.Value() }
 				});
 			}
 
@@ -91,10 +91,10 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 
 			// ResultCardOverrun
 			resultCard.Clear();
-			foreach (var result in ((ResultCard)electricalUserCfg.ResultCardOverrun).Results) {
+			foreach (var result in electricalUserCfg.ResultCardOverrun.Entries) {
 				resultCard.Add(new Dictionary<string, object>() {
-					{ "Amps",  result.Amps.Value()},
-					{"SmartAmps",result.SmartAmps.Value() }
+					{ "Amps",  result.Key.Value()},
+					{"SmartAmps",result.Value.Value() }
 				});
 			}
 
@@ -102,10 +102,10 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 
 			// ResultCardTraction
 			resultCard.Clear();
-			foreach (var result in ((ResultCard)electricalUserCfg.ResultCardTraction).Results) {
+			foreach (var result in electricalUserCfg.ResultCardTraction.Entries) {
 				resultCard.Add(new Dictionary<string, object>() {
-					{ "Amps",  result.Amps.Value()},
-					{"SmartAmps",result.SmartAmps.Value() }
+					{ "Amps",  result.Key.Value()},
+					{"SmartAmps",result.Value.Value() }
 				});
 			}