bugfix: setting axleData in declaration mode; bugfix (?): additional auxiliary in declaration mode

VECTO/cVSUM.vb

@@ -484,7 +484,7 @@ Class cVSUM
                     VSUMpath = Cfg.BATCHoutpath & fFILE(JobFile, False) & "_BATCH.vsum"
             End Select
         Else
-            VSUMpath = fFileWoExt(JobFile) & ".vsum"
+			VSUMpath = fFileWoExt(JobFile) & ".v2.vsum"
         End If
 
         'Open file

VectoCore/FileIO/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 					string.Format("Vehicle does not contain sufficient axles. {0} axles defined, {1} axles required",
 						data.AxleConfig.Axles.Count, mission.AxleWeightDistribution.Count()));
 			}
-			retVal.AxleData = new List<Axle>();
+			var axleData = new List<Axle>();
 			for (var i = 0; i < mission.AxleWeightDistribution.Length; i++) {
 				var axleInput = data.AxleConfig.Axles[i];
 				var axle = new Axle {
@@ -131,19 +131,17 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
 					TyreTestLoad = axleInput.TyreTestLoad.SI<Newton>(),
 					Inertia = DeclarationData.Wheels.Lookup(axleInput.WheelsStr.Replace(" ", "")).Inertia,
 				};
-				retVal.AxleData.Add(axle);
-			}
-
-			foreach (var tmp in mission.TrailerAxleWeightDistribution) {
-				retVal.AxleData.Add(new Axle {
-					AxleWeightShare = tmp,
-					TwinTyres = DeclarationData.Trailer.TwinTyres,
-					RollResistanceCoefficient = DeclarationData.Trailer.RollResistanceCoefficient,
-					TyreTestLoad = DeclarationData.Trailer.TyreTestLoad.SI<Newton>(),
-					Inertia = DeclarationData.Wheels.Lookup(DeclarationData.Trailer.WheelsType).Inertia
-				});
+				axleData.Add(axle);
 			}
 
+			axleData.AddRange(mission.TrailerAxleWeightDistribution.Select(tmp => new Axle {
+				AxleWeightShare = tmp,
+				TwinTyres = DeclarationData.Trailer.TwinTyres,
+				RollResistanceCoefficient = DeclarationData.Trailer.RollResistanceCoefficient,
+				TyreTestLoad = DeclarationData.Trailer.TyreTestLoad.SI<Newton>(),
+				Inertia = DeclarationData.Wheels.Lookup(DeclarationData.Trailer.WheelsType).Inertia
+			}));
+			retVal.AxleData = axleData;
 			return retVal;
 		}
 

VectoCore/FileIO/Reader/Impl/DeclarationModeSimulationDataReader.cs

@@ -186,7 +186,8 @@ namespace TUGraz.VectoCore.FileIO.Reader.Impl
 					Log.Error(message);
 					throw new VectoException(message);
 				}
-			}).Concat(new VectoRunData.AuxData { ID = "", DemandType = AuxiliaryDemandType.Direct }.ToEnumerable()).ToList();
+			}).ToList();
+			//.Concat(new VectoRunData.AuxData { ID = "", DemandType = AuxiliaryDemandType.Direct}.ToEnumerable()).ToList();
 		}
 
 		internal Segment GetVehicleClassification(VehicleCategory category, AxleConfiguration axles, Kilogram grossMassRating,

VectoCore/FileIO/Reader/Impl/EngineeringModeSimulationDataReader.cs

@@ -62,10 +62,9 @@ namespace TUGraz.VectoCore.FileIO.Reader.Impl
 				Technology = a.Technology,
 				TechList = a.TechList.DefaultIfNull(Enumerable.Empty<string>()).ToArray(),
 				DemandType = AuxiliaryDemandType.Mapping,
-				Data =
-					(!string.IsNullOrWhiteSpace(a.Path) && a.Path != "<NOFILE>")
-						? AuxiliaryData.ReadFromFile(Path.Combine(basePath, a.Path))
-						: null
+				Data = (!string.IsNullOrWhiteSpace(a.Path) && a.Path != "<NOFILE>")
+					? AuxiliaryData.ReadFromFile(Path.Combine(basePath, a.Path))
+					: null
 			}).Concat(new VectoRunData.AuxData { ID = "", DemandType = AuxiliaryDemandType.Direct }.ToEnumerable()).ToList();
 		}