Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 22217408 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Merge pull request #39 in VECTO/vecto-dev from VECTO/mq_vecto-dev:develop to develop 

* commit '0f30d052':
  building new VECTO version
  compiling help file, disable automatic help generation for deploy
  bugfix em-off signal, em-off time share, ice-off time share, max startgear selection
parents 383df14d 0f30d052
No related branches found
Tags Build/v0.7.3.2171
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 237 additions and 67 deletions
Build/Packaging.targets
+ 4
− 2
View file @ 22217408
......@@ -47,11 +47,13 @@
<Message Text="Generating Release Notes PDF"/>
<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;"/>
</Target>
<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild" Condition="$(Configuration) == 'Deploy'">
<!--
<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild" Condition="$(Configuration) == 'Deploy'">
<Message Text="Generating Help"/>
<Exec Command="&quot;$(solutiondir)documentation\user manual\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\user manual"/>
<Exec Command="&quot;$(solutiondir)documentation\VectoHashingTool\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\VectoHashingTool"/>
</Target>
</Target>
-->
<Target Name="AfterBuild" Condition="$(Configuration) == 'Deploy'">
<ItemGroup>
......
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ 22217408
No preview for this file type
Documentation/User Manual/help.html
+ 195
− 28
View file @ 22217408
This diff is collapsed.
HashingTool/Properties/Version.cs
+ 2
− 2
View file @ 22217408
......@@ -30,5 +30,5 @@
*/
using System.Reflection;
[assembly: AssemblyVersion("0.2.0.2108")]
[assembly: AssemblyFileVersion("0.2.0.2108")]
[assembly: AssemblyVersion("0.2.0.2171")]
[assembly: AssemblyFileVersion("0.2.0.2171")]
VectoCommon/VectoCommon/Properties/Version.cs
+ 2
− 2
View file @ 22217408
......@@ -30,5 +30,5 @@
*/
using System.Reflection;
[assembly: AssemblyVersion("0.7.1.2108")]
[assembly: AssemblyFileVersion("0.7.1.2108")]
\ No newline at end of file
[assembly: AssemblyVersion("0.7.3.2171")]
[assembly: AssemblyFileVersion("0.7.3.2171")]
\ No newline at end of file
VectoCommon/VectoHashing/Properties/Version.cs
+ 2
− 2
View file @ 22217408
......@@ -30,5 +30,5 @@
*/
using System.Reflection;
[assembly: AssemblyVersion("1.2.0.2108")]
[assembly: AssemblyFileVersion("1.2.0.2108")]
[assembly: AssemblyVersion("1.2.0.2171")]
[assembly: AssemblyFileVersion("1.2.0.2171")]
VectoConsole/Properties/Version.cs
+ 2
− 2
View file @ 22217408
......@@ -30,5 +30,5 @@
*/
using System.Reflection;
[assembly: AssemblyVersion("0.7.1.2108")]
[assembly: AssemblyFileVersion("0.7.1.2108")]
\ No newline at end of file
[assembly: AssemblyVersion("0.7.3.2171")]
[assembly: AssemblyFileVersion("0.7.3.2171")]
\ No newline at end of file
VectoCore/VectoCore/Models/Simulation/Data/ModalResultField.cs
+ 1
− 1
View file @ 22217408
......@@ -385,7 +385,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
[ModalResultField(typeof(SI), caption: "T_{0}-em_drive_max [Nm]")] T_EM_electricMotor_drive_max_,
[ModalResultField(typeof(SI), caption: "T_{0}-em_gen_max [Nm]")] T_EM_electricMotor_gen_max_,
[ModalResultField(typeof(SI), caption: "P_{0}-em_gen_max_ [kW]", outputFactor: 1e-3)] P_EM_electricMotor_gen_max_,
[ModalResultField(typeof(SI), caption: "P_{0}-em_gen_max [kW]", outputFactor: 1e-3)] P_EM_electricMotor_gen_max_,
[ModalResultField(typeof(SI), caption: "P_{0}-em_drive_max [kW]", outputFactor: 1e-3)] P_EM_electricMotor_drive_max_,
[ModalResultField(typeof(SI), caption: "P_{0}-em_mech [kW]", outputFactor: 1e-3)] P_EM_electricMotor_em_mech_,
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+ 3
− 3
View file @ 22217408
......@@ -299,7 +299,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (!dryRun) {
CurrentState.EMSpeed = emSpeed;
CurrentState.EMTorque = emTorque;
CurrentState.EMTorque = emOff ? null : emTorque;
CurrentState.EmTorqueMap = emTorqueMap;
CurrentState.DragMax = maxRecuperationTorqueEmMap;
CurrentState.DriveMax = maxDriveTorqueEmMap;
......@@ -391,7 +391,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_EM_electricMotor_gen_max_, Position] = (CurrentState.DragMax ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
container[ModalResultField.P_EM_electricMotor_drive_max_, Position] = (CurrentState.DriveMax ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
container[ModalResultField.P_EM_electricMotor_em_mech_, Position] = CurrentState.EMTorque * avgEMSpeed;
container[ModalResultField.P_EM_electricMotor_em_mech_, Position] = (CurrentState.EMTorque ?? 0.SI<NewtonMeter>() ) * avgEMSpeed;
container[ModalResultField.P_EM_electricMotor_em_mech_map_, Position] = (CurrentState.EmTorqueMap ?? 0.SI<NewtonMeter>()) * avgEMSpeed;
......@@ -419,7 +419,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override void DoCommitSimulationStep(Second time, Second simulationInterval)
{
var avgSpeed = (PreviousState.EMSpeed + CurrentState.EMSpeed) / 2;
var losses = CurrentState.EMTorque * avgSpeed - CurrentState.ElectricPowerToBattery;
var losses = (CurrentState.EMTorque ?? 0.SI<NewtonMeter>()) * avgSpeed - CurrentState.ElectricPowerToBattery;
ThermalBuffer += (losses - ContinuousPowerLoss) * simulationInterval;
if (ThermalBuffer < 0) {
ThermalBuffer = 0.SI<Joule>();
......
VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+ 2
− 1
View file @ 22217408
......@@ -318,7 +318,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
runData.VehicleData.DynamicTyreRadius;
var minEngineSpeed = (runData.EngineData.FullLoadCurves[0].RatedSpeed - runData.EngineData.IdleSpeed) *
Constants.SimulationSettings.ClutchClosingSpeedNorm + runData.EngineData.IdleSpeed;
foreach (var gear in GearList.Reverse()) {
MaxStartGear = GearList.First();
foreach (var gear in GearList.Reverse()) {
var gearData = GearboxModelData.Gears[gear.Gear];
if (GearshiftParams.StartSpeed * transmissionRatio * gearData.Ratio <= minEngineSpeed)
continue;
......
VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+ 19
− 19
View file @ 22217408
......@@ -1529,25 +1529,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
container[ModalResultField.HybridStrategyScore] = (CurrentState.Solution?.Score ?? 0)/1e3;
container[ModalResultField.HybridStrategySolution] = CurrentState.Solution?.U ?? -100;
//if (CurrentState.Evaluations != null) {
// container.SetDataValue(
// "HybridStrategyEvaluation",
// string.Join(
// " | ", CurrentState.Evaluations.Select(
// x => {
// var foo = string.Join(" ", x.Setting.MechanicalAssistPower.Select(e => $"{e.Key.GetName()} - {e.Value}"));
// var ice = "====";
// if (x.Response != null) {
// ice =
// $"{x.Response.Engine.TorqueOutDemand}, {x.Response.Engine.TotalTorqueDemand}, {x.Response.Engine.DynamicFullLoadTorque}";
// }
// return
// $"{x.U:F2}: {x.Score:F2}; G{x.Gear}; ({x.FuelCosts:F2} + {x.EqualityFactor:F2} * ({x.BatCosts:F2} + {x.ICEStartPenalty1:F2}) * {x.SoCPenalty:F2} + {x.ICEStartPenalty2:F2}) / {x.GearshiftPenalty:F2} = {x.Score:F2} ({foo} ICE: {ice}); {x.IgnoreReason.HumanReadable()}";
// })
// )
// );
//}
}
//if (CurrentState.Evaluations != null) {
// container.SetDataValue(
// "HybridStrategyEvaluation",
// string.Join(
// " | ", CurrentState.Evaluations.Select(
// x => {
// var foo = string.Join(" ", x.Setting.MechanicalAssistPower.Select(e => $"{e.Key.GetName()} - {e.Value}"));
// var ice = "====";
// if (x.Response != null) {
// ice =
// $"{x.Response.Engine.TorqueOutDemand}, {x.Response.Engine.TotalTorqueDemand}, {x.Response.Engine.DynamicFullLoadTorque}";
// }
// return
// $"{x.U:F2}: {x.Score:F2}; G{x.Gear}; ({x.FuelCosts:F2} + {x.EqualityFactor:F2} * ({x.BatCosts:F2} + {x.ICEStartPenalty1:F2}) * {x.SoCPenalty:F2} + {x.ICEStartPenalty2:F2}) / {x.GearshiftPenalty:F2} = {x.Score:F2} ({foo} ICE: {ice}); {x.IgnoreReason.HumanReadable()}";
// })
// )
// );
//}
}
}
......
VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+ 2
− 2
View file @ 22217408
......@@ -552,7 +552,7 @@ namespace TUGraz.VectoCore.OutputData
public static Scalar ICEOffTimeShare(this IModalDataContainer data)
{
var iceOn = data.GetValues(x => new {
dt = x[ModalResultField.ICEOn.GetName()] is DBNull
dt = x[ModalResultField.ICEOn.GetName()] is DBNull || !x.Field<Boolean>(ModalResultField.ICEOn.GetName())
? 0.SI<Second>()
: x.Field<Second>(ModalResultField.simulationInterval.GetName())
}).Sum(x => x.dt) ?? 0.SI<Second>();
......@@ -562,7 +562,7 @@ namespace TUGraz.VectoCore.OutputData
public static Scalar ElectricMotorOffTimeShare(this IModalDataContainer data, PowertrainPosition pos)
{
var emOff = data.GetValues(x => new {
dt = x[string.Format(ModalResultField.EM_Off_.GetCaption(), pos.GetName())] is DBNull
dt = x[string.Format(ModalResultField.EM_Off_.GetCaption(), pos.GetName())] is DBNull || !x.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), pos.GetName())).IsEqual(1)
? 0.SI<Second>()
: x.Field<Second>(ModalResultField.simulationInterval.GetName())
}).Sum(x => x.dt) ?? 0.SI<Second>();
......
VectoCore/VectoCore/Properties/Version.cs
+ 2
− 2
View file @ 22217408
......@@ -30,5 +30,5 @@
*/
using System.Reflection;
[assembly: AssemblyVersion("0.7.1.2108")]
[assembly: AssemblyFileVersion("0.7.1.2108")]
[assembly: AssemblyVersion("0.7.3.2171")]
[assembly: AssemblyFileVersion("0.7.3.2171")]
VectoCore/VectoCore/Utils/VectoVersionCore.cs
+ 1
− 1
View file @ 22217408
......@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
public static string VersionNumber
{
get {
return "0.7.2.2118" + SUFFIX;
return "0.7.3.2171" + SUFFIX;
}
}
......
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