This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

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
Verified Commit 0d47ea6e authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

update repository

parent 3f7f3bcb
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 97 additions and 28 deletions
Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor_DECL.vecto
+ 3
− 3
View file @ 0d47ea6e
{
"Header": {
"CreatedBy": "",
"Date": "2017-07-03T14:47:43.6586880Z",
"Date": "2021-05-27T12:30:21.0886937Z",
"AppVersion": "3",
"FileVersion": 3
"FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
......@@ -54,7 +54,7 @@
"OverSpeedEcoRoll": {
"Mode": "Overspeed",
"MinSpeed": 50.0,
"OverSpeed": 5.0,
"OverSpeed": 2.5,
"UnderSpeed": 5.0
}
}
......
Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/Class5_Tractor_ENG.vecto
+ 31
− 2
View file @ 0d47ea6e
......@@ -15,11 +15,40 @@
"AuxiliaryVersion": "CLASSIC",
"AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Technology": [
"Belt driven or driven via transm. - Electronically controlled visco clutch"
]
},
{
"ID": "STP",
"Type": "Steering pump",
"Technology": [
"Fixed displacement with elec. control"
]
},
{
"ID": "AC",
"Type": "HVAC",
"Technology": [
"Default"
]
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "Alt.vaux",
"Technology": []
"Technology": [
"Standard technology"
]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Technology": [
"Medium Supply 2-stage + ESS + AMS"
]
}
],
"Padd": 5000.0,
......
HashingCmd/App.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -9,6 +9,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
HashingCmd/Properties/Version.cs
+ 7
− 4
View file @ 0d47ea6e
/*
* This file is part of VECTO.
*
* Copyright © 2012-2019 European Union
* Copyright © 2012-2017 European Union
*
* Developed by Graz University of Technology,
* Institute of Internal Combustion Engines and Thermodynamics,
......@@ -29,6 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("0.1.0.274")]
[assembly: AssemblyFileVersion("0.1.0.274")]
[assembly: AssemblyVersion("0.1.0.2202")]
[assembly: AssemblyFileVersion("0.1.0.2202")]
HashingTool/App.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -9,6 +9,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
HashingTool/Properties/Version.cs
+ 5
− 2
View file @ 0d47ea6e
......@@ -29,6 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("0.2.0.1916")]
[assembly: AssemblyFileVersion("0.2.0.1916")]
[assembly: AssemblyVersion("0.2.0.2202")]
[assembly: AssemblyFileVersion("0.2.0.2202")]
Tools/DeclarationCycleZip/App.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -9,6 +9,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
Tools/GraphDrawer/App.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -9,6 +9,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VECTO/VECTO.vbproj
+ 1
− 0
View file @ 0d47ea6e
......@@ -180,6 +180,7 @@
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
......
VectoCommon/VectoCommon/Properties/Version.cs
+ 4
− 2
View file @ 0d47ea6e
......@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("3.3.6.1916")]
[assembly: AssemblyFileVersion("3.3.6.1916")]
\ No newline at end of file
[assembly: AssemblyVersion("3.3.6.2202")]
[assembly: AssemblyFileVersion("3.3.6.2202")]
\ No newline at end of file
VectoCommon/VectoHashing/Properties/Version.cs
+ 5
− 2
View file @ 0d47ea6e
......@@ -29,6 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("1.2.0.1916")]
[assembly: AssemblyFileVersion("1.2.0.1916")]
[assembly: AssemblyVersion("1.2.0.2202")]
[assembly: AssemblyFileVersion("1.2.0.2202")]
VectoCommon/VectoHashingTest/app.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -6,6 +6,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VectoConsole/App.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -14,6 +14,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
......
VectoConsole/Properties/Version.cs
+ 5
− 2
View file @ 0d47ea6e
......@@ -29,6 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("3.3.6.1916")]
[assembly: AssemblyFileVersion("3.3.6.1916")]
\ No newline at end of file
[assembly: AssemblyVersion("3.3.6.2202")]
[assembly: AssemblyFileVersion("3.3.6.2202")]
\ No newline at end of file
VectoCore/ModelbasedTests/app.config
+ 4
− 0
View file @ 0d47ea6e
......@@ -6,6 +6,10 @@
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
+ 1
− 1
View file @ 0d47ea6e
......@@ -93,7 +93,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
factory.JobNumber = Interlocked.Increment(ref _jobNumber);
foreach (var run in factory.SimulationRuns()) {
if(run.CycleName == "UrbanDelivery" && run.RunSuffix == "ReferenceLoad")
if(run.CycleName == "LongHaulEMS" && run.RunSuffix == "LowLoading")
{
var entry = new RunEntry { Run = run, JobContainer = this };
Runs.Add(entry);
......
VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+ 2
− 3
View file @ 0d47ea6e
......@@ -376,9 +376,8 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
IShiftStrategy strategy;
switch (runData.GearboxData.Type) {
case GearboxType.AMT:
strategy = new AMTShiftStrategy(runData, container);
//strategy = new SimulinkModelShiftStrategy(runData, container);
//strategy = new AMTShiftStrategy(runData, container);
strategy = new SimulinkModelShiftStrategy(runData, container);
break;
case GearboxType.MT:
strategy = new MTShiftStrategy(runData, container);
......
VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
+ 0
− 5
View file @ 0d47ea6e
......@@ -508,10 +508,5 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
{
get { return Wheels.ReducedMassWheels; }
}
public Second EngageTime
{
get { return Gearbox.EngageTime; }
}
}
}
\ No newline at end of file
VectoCore/VectoCore/Models/SimulationComponent/Impl/SimulinkModelShiftStrategy.cs
+ 1
− 0
View file @ 0d47ea6e
......@@ -31,6 +31,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
~SimulinkModelShiftStrategy()
{
Connector.Step(4, (0.0).SI<Second>(), (0.0).SI<Second>(), (0.0).SI<NewtonMeter>(), (0.0).SI<PerSecond>(), (0.0).SI<NewtonMeter>(), (0.0).SI<PerSecond>(), 0, (0.0).SI<Second>(), DataBus, _gearbox);
Connector.Terminate();
}
public override GearInfo NextGear
{
......
VectoCore/VectoCore/Properties/Version.cs
+ 4
− 2
View file @ 0d47ea6e
......@@ -29,6 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System.Reflection;
[assembly: AssemblyVersion("3.3.6.1916")]
[assembly: AssemblyFileVersion("3.3.6.1916")]
[assembly: AssemblyVersion("3.3.6.2202")]
[assembly: AssemblyFileVersion("3.3.6.2202")]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

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