From f849e303ee773ce4b7c1d5551d9469c0cd1ce725 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 15 Feb 2022 13:58:30 +0100
Subject: [PATCH] Compiler Warnings
---
Vecto3GUI2020Test/Vecto3GUI2020Test.csproj | 13 ++++++++-----
VectoCore/VectoCoreTest/Reports/ModDataTest.cs | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
index 5def99aa48..0a447b85ac 100644
--- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
@@ -20,6 +20,13 @@
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="PresentationFramework">
+ <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+
+
<ItemGroup>
<Folder Include="HelperTests\" />
<Folder Include="Testdata\bugreports\" />
@@ -119,10 +126,6 @@
</None>
</ItemGroup>
- <ItemGroup>
- <Reference Include="PresentationFramework">
- <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath>
- </Reference>
- </ItemGroup>
+
</Project>
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index fa280cfa5e..ce852349cf 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -642,7 +642,7 @@ namespace TUGraz.VectoCore.Tests.Reports
var pClutchOut = row[ModalResultField.P_clutch_out.GetName()];
if (pClutchOut != DBNull.Value) {
Assert.AreEqual(pGbxIn.Value(), (pClutchOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
- Assert.AreEqual(pEngOut.Value(), (pClutchOut as Watt + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}",
+ Assert.AreEqual(pEngOut.Value(), ((pClutchOut as Watt) + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}",
time, distance);
}
@@ -794,7 +794,7 @@ namespace TUGraz.VectoCore.Tests.Reports
//if (pClutchOut != DBNull.Value) {
Assert.AreEqual(pGbxIn.Value(), (pClutchOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
var pP1Out = row[p1OutColumn] as Watt;
- Assert.AreEqual(pP1Out.Value(), (pClutchOut as Watt + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}",
+ Assert.AreEqual(pP1Out.Value(), ((pClutchOut as Watt) + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}",
time, distance);
var pP1Loss = row[p1LossColumn] as Watt;
--
GitLab