Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 3d6fd1f2 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

read cycle from filesystem if available

parent 5964654d
Branches
Tags
No related merge requests found
......@@ -113,18 +113,28 @@ namespace TUGraz.VectoCore.Models.Declaration
continue;
}
// TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
Stream cycle;
var cycleFile = Path.Combine("DeclarationMissions",
missionType.ToString().Replace("EMS", "") + ".vdri");
if (File.Exists(cycleFile)) {
cycle = File.OpenRead(cycleFile);
} else {
cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile);
}
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
#if USE_EXTENAL_DECLARATION_DATA
CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
#else
CycleFile =
RessourceHelper.ReadStream(
DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile),
#endif
CycleFile = cycle,
//CycleFile =
// RessourceHelper.ReadStream(
// DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
// missionType.ToString().Replace("EMS", "") +
// Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row),
BodyCurbWeight = 0.SI<Kilogram>(),
Trailer = new List<MissionTrailer>(),
......
......@@ -93,17 +93,27 @@ namespace TUGraz.VectoCore.Models.Declaration
var passengerCountLow = busFloorArea * passengerDensityLow; // weight of driver is included in curb mass
var passengerCountRef = busFloorArea * passengerDensityRef; // weight of driver is included in curb mass
//var refLoad = passengerCountRef * missionType.GetAveragePassengerMass();
// TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
Stream cycle;
var cycleFile = Path.Combine("DeclarationMissions",
missionType.ToString().Replace("EMS", "") + ".vdri");
if (File.Exists(cycleFile)) {
cycle = File.OpenRead(cycleFile);
} else {
cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile);
}
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
#if USE_EXTENAL_DECLARATION_DATA
CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
#else
CycleFile = RessourceHelper.ReadStream(
DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile),
#endif
CycleFile = cycle,
//CycleFile = RessourceHelper.ReadStream(
// DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
// missionType.ToString().Replace("EMS", "") +
// Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row),
CurbMass = row.ParseDouble("curbmass").SI<Kilogram>(),
BodyCurbWeight = 0.SI<Kilogram>(),
......
......@@ -199,16 +199,26 @@ namespace TUGraz.VectoCore.Models.Declaration
GetLoadings(
out var lowLoad, out var refLoad, payloads, (p, l) => GetLoading(p, weight, vehicleWeight, trailers, l), maxLoad);
// TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
Stream cycle;
var cycleFile = Path.Combine("DeclarationMissions",
missionType.ToString().Replace("EMS", "") + ".vdri");
if (File.Exists(cycleFile)) {
cycle = File.OpenRead(cycleFile);
} else {
cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile);
}
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection" + GetMissionSuffix(missionType, true)),
#if USE_EXTENAL_DECLARATION_DATA
CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
#else
CycleFile = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
missionType.ToString().Replace("EMS", "") +
Constants.FileExtensions.CycleFile),
#endif
CycleFile = cycle,
//CycleFile = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
// missionType.ToString().Replace("EMS", "") +
// Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row, missionType),
BodyCurbWeight = body.CurbWeight,
Trailer = trailers,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment