From 683578fb4730024b6197c9b8e838b279aa2ce7bf Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 9 Nov 2015 12:41:25 +0100
Subject: [PATCH] update version
---
VectoConsole/Properties/Version.cs | 6 +++---
VectoCore/Properties/Version.cs | 6 +++---
.../Integration/FullCycleDeclarationTest.cs | 17 +++++++++++++++++
VectoCoreTest/Reports/SumWriterTest.cs | 5 +++--
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index b36d9440a8..aa78e2c813 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -1,6 +1,6 @@
using System.Reflection;
-// generated on 07.11.2015 21:12:54
-[assembly: AssemblyVersion("3.0.1.310")]
-[assembly: AssemblyFileVersion("3.0.1.310")]
+// generated on 09.11.2015 10:21:43
+[assembly: AssemblyVersion("3.0.1.312")]
+[assembly: AssemblyFileVersion("3.0.1.312")]
diff --git a/VectoCore/Properties/Version.cs b/VectoCore/Properties/Version.cs
index 3f913b0408..d1252b4226 100644
--- a/VectoCore/Properties/Version.cs
+++ b/VectoCore/Properties/Version.cs
@@ -1,5 +1,5 @@
using System.Reflection;
-// generated on 07.11.2015 22:40:05
-[assembly: AssemblyVersion("3.0.1.310")]
-[assembly: AssemblyFileVersion("3.0.1.310")]
+// generated on 09.11.2015 10:21:28
+[assembly: AssemblyVersion("3.0.1.312")]
+[assembly: AssemblyFileVersion("3.0.1.312")]
diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index 6e27ea4acb..104464d3d6 100644
--- a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -1,4 +1,5 @@
using System.IO;
+using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NLog;
using TUGraz.VectoCore.Configuration;
@@ -40,6 +41,22 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(run.FinishedWithoutErrors);
}
+ [TestMethod]
+ public void Truck40t_RegionalDeliveryCycle_RefLoad_Declaration()
+ {
+ var factory = new SimulatorFactory(SimulatorFactory.FactoryMode.DeclarationMode,
+ @"c:\Users\Technik\Downloads\40t Long Haul Truck\40t_Long_Haul_Truck.vecto");
+ factory.WriteModalResults = true;
+ factory.SumWriter = new SummaryFileWriter("Test.vsum");
+ var runs = factory.SimulationRuns().ToArray();
+
+ var run = runs[4];
+ run.Run();
+
+ Assert.IsTrue(run.FinishedWithoutErrors);
+ }
+
+
[TestMethod]
public void Truck40t_UrbanDeliveryCycle_RefLoad()
{
diff --git a/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCoreTest/Reports/SumWriterTest.cs
index 2ed42e90ea..e6bf52553d 100644
--- a/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCoreTest/Reports/SumWriterTest.cs
@@ -1,6 +1,7 @@
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Reports
@@ -35,7 +36,7 @@ namespace TUGraz.VectoCore.Tests.Reports
sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
- modData.Finish();
+ modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
var sumData = VectoCSVFile.Read("testsumcalc_fixed.vsum", false, true);
@@ -83,7 +84,7 @@ namespace TUGraz.VectoCore.Tests.Reports
sumWriter.WriteFullPowertrain(modData, "testSumCalc", "--", "--", 0.SI<Kilogram>(), 0.SI<Kilogram>());
- modData.Finish();
+ modData.Finish(VectoRun.Status.Success);
sumWriter.Finish();
var sumData = VectoCSVFile.Read("testsumcalc_var.vsum", false, true);
--
GitLab