Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

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

Merge branch 'amdm2/develop' into 'amdm2/main' 

creating new release candiate

See merge request vecto/vecto!37
parents 9308898a 2644db8f
No related branches found
Tags Release/4.3.2-RC
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 65 deletions
Directory.Build.props
+ 3
− 1
View file @ 8ec74956
......@@ -12,7 +12,9 @@
<VersionSuffix>RC</VersionSuffix>
<!-- The following settings are used as default values for ALL projects -->
<VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>
<Days>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</Days>
<VersionPrefix>$(MainProductVersion).$(Days)</VersionPrefix>
<Authors>Graz University of Technology</Authors>
<Company>European Union</Company>
<Copyright>Copyright © 2012-$([System.DateTime]::UtcNow.Year)</Copyright>
......
Directory.Build.targets
+ 7
− 7
View file @ 8ec74956
......@@ -9,7 +9,7 @@
<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
<Message Text="Packaging in $(Configuration) Configuration" Importance="high" />
<Message Text="Packaging in $(Configuration) Configuration $(VersionPrefix)" Importance="high" />
<Exec Command="cscript &quot;$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
<PropertyGroup>
<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
......@@ -176,14 +176,14 @@
<!-- <Copy SourceFiles="$(ParameterDocuStyle)" DestinationFolder="$(DeployPath)User Manual\Parameter Documentation\HTML\css"/> -->
<!-- NuGet Files-->
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\Release\*$(Days)*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*$(Days)*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*$(Days)*.nupkg" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\MockupRelease\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\MockupRelease\*$(Days)*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*$(Days)*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*$(Days)*.nupkg" />
</ItemGroup>
<Copy SourceFiles="@(VectoNuget)" DestinationFolder ="$(NuGetPath)"/>
......
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ 8ec74956
No preview for this file type
VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/CO2Writer.cs
+ 8
− 45
View file @ 8ec74956
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using TUGraz.VectoCommon.Models;
......@@ -33,48 +32,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
protected abstract IList<FormattedReportValue> GetCO2ResultEntries(Kilogram co2, Meter distance, Kilogram payload,
CubicMeter volume, double? passengers);
protected object[] Format3Significant1Decimal(ConvertedSI value)
{
return value.ValueAsUnit(3, 1);
}
protected object[] Format1Decimal(ConvertedSI value)
{
return value.ValueAsUnit(1);
}
protected object[] Format2Decimal(ConvertedSI value)
{
return value.ValueAsUnit(2);
}
}
public class FormattedReportValue
{
public ConvertedSI Value { get; }
protected Func<ConvertedSI, object[]> Formatter;
public FormattedReportValue(ConvertedSI value, Func<ConvertedSI, object[]> formatter = null)
{
Value = value;
Formatter = formatter ?? DefaultFormat;
}
public object[] GetElement()
{
return Formatter(Value);
}
protected object[] DefaultFormat(ConvertedSI value)
{
return Value.ValueAsUnit(3, 1);
}
}
public class LorryCO2Writer : CO2WriterBase
public class LorryCO2Writer : CO2WriterBase
{
public LorryCO2Writer(ICommonResultsWriterFactory factory, XNamespace ns) : base(factory, ns) { }
......@@ -84,7 +47,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
var retVal = new List<FormattedReportValue>() {
new FormattedReportValue((CO2Total / distance).ConvertToGrammPerKiloMeter()),
new FormattedReportValue((CO2Total / distance / payload).ConvertToGrammPerTonKilometer(), Format1Decimal),
new FormattedReportValue((CO2Total / distance / payload).ConvertToGrammPerTonKilometer(), FormattedReportValue.Format1Decimal),
};
if (volume.IsGreater(0)) {
retVal.Add(new FormattedReportValue((CO2Total / distance / volume).ConvertToGrammPerCubicMeterKiloMeter()));
......@@ -103,7 +66,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
return new[] {
new FormattedReportValue((CO2Total / distance).ConvertToGrammPerKiloMeter()),
new FormattedReportValue((CO2Total / distance / passengers.Value).ConvertToGrammPerPassengerKilometer(), Format2Decimal),
new FormattedReportValue((CO2Total / distance / passengers.Value).ConvertToGrammPerPassengerKilometer(), FormattedReportValue.Format2Decimal),
};
}
......@@ -127,7 +90,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, entry.AuxHeaterFuel.FuelType.ToXMLFormat()),
tmp?.GetFuelConsumptionEntries(entry.ZEV_FuelConsumption_AuxHtr, entry.AuxHeaterFuel, entry.Distance,
entry.Payload, entry.CargoVolume, entry.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Results_FuelConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Results_FuelConsumption, new FormattedReportValue(x).GetElement()))
),
new XElement(TNS + XMLNames.Report_ResultEntry_CO2ZEVAuxHeater,
GetCO2ResultEntries(entry.ZEV_CO2, entry.Distance, entry.Payload, entry.CargoVolume,
......@@ -149,7 +112,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, entry.AuxHeaterFuel.FuelType.ToXMLFormat()),
tmp?.GetFuelConsumptionEntries(entry.ZEV_FuelConsumption_AuxHtr, entry.AuxHeaterFuel, entry.Distance,
entry.Payload, entry.CargoVolume, entry.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Results_FuelConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Results_FuelConsumption, new FormattedReportValue(x).GetElement()))
),
new XElement(TNS + XMLNames.Report_ResultEntry_CO2ZEVAuxHeater,
GetCO2ResultEntries(entry.ZEV_CO2, entry.Distance, entry.Payload, entry.CargoVolume,
......
VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ElectricEnergyWriter.cs
+ 2
− 2
View file @ 8ec74956
......@@ -19,7 +19,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
return new XElement(TNS + ElectricEnergyConsumptionXMLElementName,
GetEnergyConsumption(entry.ElectricEnergyConsumption, entry.Distance, entry.Payload, entry.CargoVolume,
entry.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, new FormattedReportValue(x).GetElement()))
);
}
......@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
return new XElement(TNS + ElectricEnergyConsumptionXMLElementName,
GetEnergyConsumption(weighted.ElectricEnergyConsumption, weighted.Distance, weighted.Payload, weighted.CargoVolume,
weighted.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, new FormattedReportValue(x).GetElement()))
);
}
......
VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/FormattedReportValue.cs 0 → 100644
+ 40
− 0
View file @ 8ec74956
using System;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
public class FormattedReportValue
{
public ConvertedSI Value { get; }
protected Func<ConvertedSI, object[]> Formatter;
public FormattedReportValue(ConvertedSI value, Func<ConvertedSI, object[]> formatter = null)
{
Value = value;
Formatter = formatter ?? DefaultFormat;
}
public object[] GetElement()
{
return Formatter(Value);
}
protected object[] DefaultFormat(ConvertedSI value)
{
return Value.ValueAsUnit(4, 1);
}
public static object[] Format1Decimal(ConvertedSI value)
{
return value.ValueAsUnit(1);
}
public static object[] Format2Decimal(ConvertedSI value)
{
return value.ValueAsUnit(2);
}
}
}
\ No newline at end of file
VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/FuelConsumptionWriter.cs
+ 3
− 2
View file @ 8ec74956
......@@ -32,9 +32,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
return new XElement(TNS + XMLNames.Report_Results_Fuel,
new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, fuel.FuelType.ToXMLFormat()),
GetFuelConsumptionEntries(consumption, fuel, distance, payLoad, cargoVolume, passengerCount).Select(x => new XElement(TNS + XMLNames.Report_Results_FuelConsumption, x.ValueAsUnit(3, 1)))
GetFuelConsumptionEntries(consumption, fuel, distance, payLoad, cargoVolume, passengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Results_FuelConsumption, new FormattedReportValue(x).GetElement()))
);
}
}
#endregion
......
VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultGroupWriter.cs
+ 6
− 6
View file @ 8ec74956
......@@ -95,11 +95,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
return new[] {
new XElement(TNS + XMLNames.Report_ResultEntry_ActualChargeDepletingRange,
XMLHelper.ValueAsUnit(result.ActualChargeDepletingRange.ConvertToKiloMeter())),
result.ActualChargeDepletingRange.ConvertToKiloMeter().ValueAsUnit()),
new XElement(TNS + XMLNames.Report_ResultEntry_EquivalentAllElectricRange,
XMLHelper.ValueAsUnit(result.EquivalentAllElectricRange.ConvertToKiloMeter())),
result.EquivalentAllElectricRange.ConvertToKiloMeter().ValueAsUnit()),
new XElement(TNS + XMLNames.Report_ResultEntry_ZeroCO2EmissionsRange,
XMLHelper.ValueAsUnit(result.ZeroCO2EmissionsRange.ConvertToKiloMeter())),
result.ZeroCO2EmissionsRange.ConvertToKiloMeter().ValueAsUnit()),
};
}
......@@ -107,11 +107,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
{
return new[] {
new XElement(TNS + XMLNames.Report_ResultEntry_ActualChargeDepletingRange,
XMLHelper.ValueAsUnit(weightedResult.ActualChargeDepletingRange.ConvertToKiloMeter())),
weightedResult.ActualChargeDepletingRange.ConvertToKiloMeter().ValueAsUnit()),
new XElement(TNS + XMLNames.Report_ResultEntry_EquivalentAllElectricRange,
XMLHelper.ValueAsUnit(weightedResult.EquivalentAllElectricRange.ConvertToKiloMeter())),
weightedResult.EquivalentAllElectricRange.ConvertToKiloMeter().ValueAsUnit()),
new XElement(TNS + XMLNames.Report_ResultEntry_ZeroCO2EmissionsRange,
XMLHelper.ValueAsUnit(weightedResult.ZeroCO2EmissionsRange.ConvertToKiloMeter())),
weightedResult.ZeroCO2EmissionsRange.ConvertToKiloMeter().ValueAsUnit()),
};
}
......
VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ResultWriter/ResultGroupWriter.cs
+ 2
− 2
View file @ 8ec74956
......@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, fc.Fuel.FuelType.ToXMLFormat()),
GetFuelConsumptionEntries(fc.TotalFuelConsumptionCorrected, fc.Fuel, entry.Distance, entry.Payload,
entry.CargoVolume, entry.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, new FormattedReportValue(x).GetElement()))
);
}
......@@ -131,7 +131,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, fuel.FuelType.ToXMLFormat()),
GetFuelConsumptionEntries(consumption, fuel, entry.Distance, entry.Payload, entry.CargoVolume,
entry.PassengerCount).Select(x =>
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, x.ValueAsUnit(3, 1)))
new XElement(TNS + XMLNames.Report_Result_EnergyConsumption, new FormattedReportValue(x).GetElement()))
);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about