diff --git a/Build/Packaging.targets b/Build/Packaging.targets
index 13c8e3fd373780a4ffad857bee8390a930acf66f..8c58ace1b4513eea95338b41735d0b409b24a22d 100644
--- a/Build/Packaging.targets
+++ b/Build/Packaging.targets
@@ -73,8 +73,8 @@
<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
<HashingTool Include="$(SolutionDir)HashingTool\bin\Deploy\HashingTool.exe"/>
- <HashingTool Include="$(SolutionDir)VectoCommon\VectoHashing\bin\Deploy\VectoHashing.XML"/>
- <HashingTool Include="$(SolutionDir)HashingCmd\bin\Deploy\hashingcmd.exe"/>
+ <HashingTool Include="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\VectoHashing.XML"/>
+ <HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\hashingcmd.exe"/>
</ItemGroup>
<Message Text="@(VectoCommandLine)"/>
diff --git a/Build/TextPreProcessing.targets b/Build/TextPreProcessing.targets
index 84040e35b32256a9d0fbbe0fc0c525e0534f0da0..237fed846f5d0519ed41956824962c774f420580 100644
--- a/Build/TextPreProcessing.targets
+++ b/Build/TextPreProcessing.targets
@@ -4,6 +4,7 @@
<VersionTemplates Include="$(ProjectDir)**\Version.tt"/>
<VersionTemplates Include="$(ProjectDir)**\*.tt"/>
</ItemGroup>
- <Exec Condition="'@(VersionTemplates)'!=''" Command=""%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe" -I $(SolutionDir) "%(VersionTemplates.Identity)""/>
+ <!-- <Exec Condition="'@(VersionTemplates)'!=''" Command=""%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe" -I $(SolutionDir) "%(VersionTemplates.Identity)""/> -->
+ <Exec Condition="'@(VersionTemplates)'!=''" Command=""%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe" -I $(SolutionDir) "%(VersionTemplates.Identity)""/>
</Target>
</Project>
\ No newline at end of file
diff --git a/Documentation/User Manual/convert.bat b/Documentation/User Manual/convert.bat
index 20a74b750cc7803a44bed9b89f2e7ec3900cb22c..12ba5d5aecc9c4adfd8c95998d53766b3a4fe3a2 100644
--- a/Documentation/User Manual/convert.bat
+++ b/Documentation/User Manual/convert.bat
@@ -9,7 +9,7 @@ for /f %%f in (files.txt) do set LIST=!LIST! "%%f"
REM pandoc --verbose -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --mathjax=includes/mathjax.js -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
-%LOCALAPPDATA%\Pandoc\pandoc --verbose -f markdown+raw_html %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
+%LOCALAPPDATA%\Pandoc\pandoc --verbose -f markdown+raw_html %LIST% -s --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -c includes/print.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
REM pandoc %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex -c includes/style.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
REM pandoc %LIST% -s -S --toc --toc-depth=2 --self-contained --email-obfuscation=none --section-divs --webtex="https://latex.codecogs.com/svg.latex?\large " -c includes/style.css -B includes/header.html -A includes/footer.html -o help.html -H includes/jquery.js -H includes/jquery-ui.js -H includes/include.js
diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj
index c64fcb1aec14093d66d043508d7fe5d1ba1bc7b5..371a4c2c0d3ca73df43a790739d28d96be5a4ca9 100644
--- a/HashingTool/HashingTool.csproj
+++ b/HashingTool/HashingTool.csproj
@@ -36,6 +36,16 @@
<PropertyGroup>
<ApplicationIcon>HashingIcon.ico</ApplicationIcon>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
+ <OutputPath>bin\Deploy\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <Prefer32Bit>true</Prefer32Bit>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -251,5 +261,5 @@
<Target Name="AfterBuild">
</Target>
-->
- <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
+ <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
</Project>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index dbc297d72ab6f209085e9cb089ed9c00cc0ef3f2..ef6a15de8ad1d5699d0746b43c76fdf1003847ba 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -20,7 +20,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Debug\VectoHashing.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Release\VectoHashing.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -73,7 +75,6 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 4a749279086055a27de4821d4565770688b5d526..a48aebc58f697f75ccd0fdcccbd166dc2f7532af 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -498,7 +498,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public NewtonMeter FullDragTorque { get; set; }
}
- protected class CombustionEngineIdleController : LoggingObject, IIdleController
+ protected internal class CombustionEngineIdleController : LoggingObject, IIdleController
{
private const double PeDropSlope = -5;
private const double PeDropOffset = 1.0;
@@ -528,7 +528,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
_idleStart = null;
}
- public IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
+ public virtual IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
bool dryRun = false)
{
if (!_dataBus.VehicleStopped && _dataBus.Gear != _dataBus.NextGear.Gear && _dataBus.Gear != 0 &&
@@ -600,7 +600,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
- private IResponse RequestIdling(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
+ protected IResponse RequestIdling(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
{
if (outAngularVelocity != null) {
throw new VectoException("IdleController can only handle idle requests, i.e. angularVelocity == null!");
@@ -657,5 +657,19 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
return retVal;
}
}
+
+ protected internal class CombustionEngineNoDubleclutchIdleController : CombustionEngineIdleController
+ {
+ public CombustionEngineNoDubleclutchIdleController(CombustionEngine combustionEngine, IDataBus dataBus) : base(combustionEngine, dataBus)
+ {
+ }
+
+ public override IResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity,
+ bool dryRun = false)
+ {
+
+ return RequestIdling(absTime, dt, outTorque, outAngularVelocity);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 271776d82b163049909a3997afe6efb881be211b..7d4ae9baea35172e38a567d3f292d492e1d9977b 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -137,14 +137,20 @@
<Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringRetarderDataProvider.cs" />
<Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringTorqueConverterDataProvider.cs" />
<Compile Include="InputData\FileIO\XML\Engineering\XMLEngineeringVehicleDataProvider.cs" />
- <Compile Include="InputData\Impl\InputData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONGearboxData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONInputData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONInputDataFactory.cs" />
<Compile Include="InputData\FileIO\JSON\JSONVehicleData.cs" />
+ <Compile Include="InputData\Impl\InputData.cs" />
<Compile Include="InputData\IVectoRunDataFactory.cs" />
+ <Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\AuxiliaryDataReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\CrossWindCorrectionCurveReader.cs" />
<Compile Include="InputData\Reader\ComponentData\PTOIdleLossMapReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
+ <Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
<Compile Include="InputData\Reader\DataObjectAdapter\AbstractSimulationDataAdapter.cs" />
<Compile Include="InputData\Reader\DataObjectAdapter\DeclarationDataAdapter.cs" />
<Compile Include="InputData\Reader\DataObjectAdapter\EngineeringDataAdapter.cs" />
@@ -162,15 +168,10 @@
<Compile Include="Models\Connector\Ports\Impl\Response.cs" />
<Compile Include="Models\Connector\Ports\IFvPort.cs" />
<Compile Include="Models\Connector\Ports\ITnPort.cs" />
- <Compile Include="InputData\Reader\ComponentData\AccelerationCurveReader.cs" />
<Compile Include="Models\Declaration\FuelData.cs" />
<Compile Include="Models\Declaration\PTOTransmission.cs" />
<Compile Include="Models\Declaration\IDeclarationAuxiliaryTable.cs" />
<Compile Include="Models\SimulationComponent\Data\AngledriveData.cs" />
- <Compile Include="InputData\Reader\ComponentData\TransmissionLossMapReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\RetarderLossMapReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\TorqueConverterDataReader.cs" />
- <Compile Include="InputData\Reader\ComponentData\AuxiliaryDataReader.cs" />
<Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMapReader.cs" />
<Compile Include="Models\SimulationComponent\Data\PTOData.cs" />
<Compile Include="Models\SimulationComponent\ILossMap.cs" />
@@ -180,6 +181,7 @@
<Compile Include="Models\SimulationComponent\Impl\ATShiftStrategy.cs" />
<Compile Include="Models\SimulationComponent\Impl\BaseShiftStrategy.cs" />
<Compile Include="Models\SimulationComponent\Impl\DrivingCycleEnumerator.cs" />
+ <Compile Include="Models\SimulationComponent\Impl\EPTPCombustionEngine.cs" />
<Compile Include="Models\SimulationComponent\Impl\MeasuredSpeedDrivingCycle.cs" />
<Compile Include="Models\SimulationComponent\Impl\PTOCycleController.cs" />
<Compile Include="Models\SimulationComponent\Impl\PWheelCycle.cs" />
@@ -187,6 +189,7 @@
<Compile Include="Models\SimulationComponent\Impl\IdleControllerSwitcher.cs" />
<Compile Include="Models\Simulation\Data\ModalResultField.cs" />
<Compile Include="InputData\Reader\Impl\EngineeringEPTPModeVectoRunDataFactory.cs" />
+ <Compile Include="Models\SimulationComponent\Impl\EPTPCycle.cs" />
<Compile Include="OutputData\ModFilter\ActualModalDataFilter.cs" />
<Compile Include="OutputData\ModFilter\ModalData1HzFilter.cs" />
<Compile Include="OutputData\XML\AbstractXMLWriter.cs" />
@@ -211,7 +214,6 @@
<Compile Include="Models\Declaration\Wheels.cs" />
<Compile Include="Models\Declaration\WHTCCorrection.cs" />
<Compile Include="Models\SimulationComponent\Data\CrosswindCorrectionCdxALookup.cs" />
- <Compile Include="InputData\Reader\ComponentData\CrossWindCorrectionCurveReader.cs" />
<Compile Include="Models\SimulationComponent\Data\AuxiliaryData.cs" />
<Compile Include="Models\SimulationComponent\Data\AuxSupplyPowerReader.cs" />
<Compile Include="Models\SimulationComponent\Data\AxleGearData.cs" />