From 3e7a645b1216851943838358ccdedb738958dbdf Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 1 Aug 2016 11:54:13 +0200
Subject: [PATCH] moved Constants back to VectoCore
---
VECTO/GUI/F_GBX.vb | 2 +-
VECTO/Input Files/cMAP.vb | 2 +-
VECTO/cDeclaration.vb | 4 +-
.../VectoCommon/Models/AuxiliaryType.cs | 42 -----------------
VectoCommon/VectoCommon/VectoCommon.csproj | 1 -
VectoConsole/Program.cs | 2 +-
.../VectoCore}/Configuration/Constants.cs | 2 +-
.../InputData/FileIO/JSON/JSONInputData.cs | 3 +-
.../DeclarationDataAdapter.cs | 2 +-
.../Reader/DrivingCycleDataReader.cs | 2 +-
.../Models/Declaration/AuxiliaryTypeHelper.cs | 45 +++++++++++++++++++
.../Models/Declaration/DeclarationData.cs | 2 +-
.../VectoCore/Models/Declaration/Segments.cs | 2 +-
.../Models/Simulation/Data/VectoRunData.cs | 2 +-
.../Models/Simulation/Impl/DistanceRun.cs | 2 +-
.../Simulation/Impl/SimulatorFactory.cs | 2 +-
.../Models/Simulation/Impl/TimeRun.cs | 2 +-
.../Data/AuxSupplyPowerReader.cs | 2 +-
.../Data/CombustionEngineData.cs | 2 +-
.../Data/Engine/FuelConsumptionMap.cs | 2 +-
.../SimulationComponent/Data/FullLoadCurve.cs | 2 +-
.../Data/Gearbox/TransmissionLossMap.cs | 2 +-
.../SimulationComponent/Data/VehicleData.cs | 2 +-
.../Impl/AMTShiftStrategy.cs | 2 +-
.../Models/SimulationComponent/Impl/Clutch.cs | 2 +-
.../Impl/CombustionEngine.cs | 2 +-
.../SimulationComponent/Impl/CycleGearbox.cs | 2 +-
.../Impl/DefaultDriverStrategy.cs | 2 +-
.../Impl/DistanceBasedDrivingCycle.cs | 2 +-
.../Models/SimulationComponent/Impl/Driver.cs | 2 +-
.../SimulationComponent/Impl/Gearbox.cs | 2 +-
.../Impl/PowertrainDrivingCycle.cs | 2 +-
.../SimulationComponent/Impl/ShiftStrategy.cs | 2 +-
.../SimulationComponent/Impl/Vehicle.cs | 2 +-
.../OutputData/FileIO/FileOutputWriter.cs | 2 +-
VectoCore/VectoCore/Utils/SearchAlgorithm.cs | 2 +-
VectoCore/VectoCore/VectoCore.csproj | 2 +
.../BusAuxiliaries/BusAdapterTest.cs | 2 +-
.../EngineOnlyCycle/EngineOnlyCycleTest.cs | 2 +-
.../SimulationRuns/FullPowertrain.cs | 2 +-
.../SimulationRuns/MinimalPowertrain.cs | 2 +-
.../CombustionEngineTest.cs | 2 +-
.../Models/SimulationComponent/DriverTest.cs | 2 +-
.../Models/SimulationComponent/GearboxTest.cs | 2 +-
.../AuxiliaryTypeHelperTest.cs | 5 +--
.../VectoCoreTest/Utils/ShiftPolygonDrawer.cs | 2 +-
46 files changed, 92 insertions(+), 88 deletions(-)
rename {VectoCommon/VectoCommon => VectoCore/VectoCore}/Configuration/Constants.cs (99%)
create mode 100644 VectoCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index c96cefab13..71b28e3e8a 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -11,9 +11,9 @@
Imports System.Collections.Generic
Imports System.Globalization
Imports System.Linq
-Imports TUGraz.VectoCommon.Configuration
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.Configuration
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb
index fe38918268..306c02c1df 100644
--- a/VECTO/Input Files/cMAP.vb
+++ b/VECTO/Input Files/cMAP.vb
@@ -9,8 +9,8 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
-Imports TUGraz.VectoCommon.Configuration
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.Configuration
Imports VectoAuxiliaries
Public Class cMAP
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index 046ef91cc8..9fd4f4a13c 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -443,7 +443,7 @@ Public Class cDeclaration
Do While Not file.EndOfFile
line = file.ReadLine
at0.Add(line(0))
- AuxSteepPumpFactors.Add(line(0), New Single() {CSng(line(1)), CSng(line(2)), CSng(line(3)), CSng(line(4))})
+ AuxSteepPumpFactors.Add(line(0), New Single() {CSng(line(1)), CSng(line(2)), CSng(line(3))})
Loop
file.Close()
If Not file.OpenRead(MyDeclPath & "VAUX\SP-Table.csv") Then
@@ -462,7 +462,7 @@ Public Class cDeclaration
STEpower0.Add(mt0, New Single() {0})
Else
stl = line(i).Split("/")
- STEpower0.Add(mt0, New Single() {CSng(stl(0)), CSng(stl(1)), CSng(stl(2)), CSng(stl(3))})
+ STEpower0.Add(mt0, New Single() {CSng(stl(0)), CSng(stl(1)), CSng(stl(2))})
End If
Next
AuxSteerPumpPower.Add(line(0), STEpower0)
diff --git a/VectoCommon/VectoCommon/Models/AuxiliaryType.cs b/VectoCommon/VectoCommon/Models/AuxiliaryType.cs
index bb17b4e460..79240f2b3d 100644
--- a/VectoCommon/VectoCommon/Models/AuxiliaryType.cs
+++ b/VectoCommon/VectoCommon/Models/AuxiliaryType.cs
@@ -29,9 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System;
-using TUGraz.VectoCommon.Configuration;
-
namespace TUGraz.VectoCommon.Models
{
public enum AuxiliaryType
@@ -42,43 +39,4 @@ namespace TUGraz.VectoCommon.Models
PneumaticSystem,
ElectricSystem
}
-
- public static class AuxiliaryTypeHelper
- {
- public static AuxiliaryType Parse(string s)
- {
- switch (s) {
- case Constants.Auxiliaries.Names.Fan:
- return AuxiliaryType.Fan;
- case Constants.Auxiliaries.Names.SteeringPump:
- return AuxiliaryType.SteeringPump;
- case Constants.Auxiliaries.Names.HeatingVentilationAirCondition:
- return AuxiliaryType.HVAC;
- case Constants.Auxiliaries.Names.ElectricSystem:
- return AuxiliaryType.ElectricSystem;
- case Constants.Auxiliaries.Names.PneumaticSystem:
- return AuxiliaryType.PneumaticSystem;
- default:
- throw new ArgumentOutOfRangeException("s", s, "Could not parse auxiliary type string.");
- }
- }
-
- public static string ToString(AuxiliaryType t)
- {
- switch (t) {
- case AuxiliaryType.Fan:
- return Constants.Auxiliaries.Names.Fan;
- case AuxiliaryType.SteeringPump:
- return Constants.Auxiliaries.Names.SteeringPump;
- case AuxiliaryType.HVAC:
- return Constants.Auxiliaries.Names.HeatingVentilationAirCondition;
- case AuxiliaryType.PneumaticSystem:
- return Constants.Auxiliaries.Names.PneumaticSystem;
- case AuxiliaryType.ElectricSystem:
- return Constants.Auxiliaries.Names.ElectricSystem;
- default:
- throw new ArgumentOutOfRangeException();
- }
- }
- }
}
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index bf62a3099f..1132531c6f 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -44,7 +44,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Configuration\Constants.cs" />
<Compile Include="Models\AuxiliaryType.cs" />
<Compile Include="Exceptions\VectoExceptions.cs" />
<Compile Include="Exceptions\VectoSimulationException.cs" />
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 5d5db70dae..d6bd3f87c8 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -41,8 +41,8 @@ using NLog;
using NLog.Config;
using NLog.Targets;
using TUGraz.VectoAPI.InputData;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
diff --git a/VectoCommon/VectoCommon/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs
similarity index 99%
rename from VectoCommon/VectoCommon/Configuration/Constants.cs
rename to VectoCore/VectoCore/Configuration/Constants.cs
index 31c6ccf333..51389efcaa 100644
--- a/VectoCommon/VectoCommon/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -32,7 +32,7 @@
using System;
using TUGraz.VectoCommon.Utils;
-namespace TUGraz.VectoCommon.Configuration
+namespace TUGraz.VectoCore.Configuration
{
public static class Constants
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 47dde0cf0c..56584e0c30 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -36,15 +36,16 @@ using System.IO;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
+using AuxiliaryTypeHelper = TUGraz.VectoCore.Models.Declaration.AuxiliaryTypeHelper;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index a95ea91f5b..5174534314 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -32,11 +32,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
index 66e943637a..8d16fbe265 100644
--- a/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
@@ -34,10 +34,10 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs b/VectoCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs
new file mode 100644
index 0000000000..1be66cc92f
--- /dev/null
+++ b/VectoCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs
@@ -0,0 +1,45 @@
+using System;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Configuration;
+
+namespace TUGraz.VectoCore.Models.Declaration
+{
+ public static class AuxiliaryTypeHelper
+ {
+ public static AuxiliaryType Parse(string s)
+ {
+ switch (s) {
+ case Constants.Auxiliaries.Names.Fan:
+ return AuxiliaryType.Fan;
+ case Constants.Auxiliaries.Names.SteeringPump:
+ return AuxiliaryType.SteeringPump;
+ case Constants.Auxiliaries.Names.HeatingVentilationAirCondition:
+ return AuxiliaryType.HVAC;
+ case Constants.Auxiliaries.Names.ElectricSystem:
+ return AuxiliaryType.ElectricSystem;
+ case Constants.Auxiliaries.Names.PneumaticSystem:
+ return AuxiliaryType.PneumaticSystem;
+ default:
+ throw new ArgumentOutOfRangeException("s", s, "Could not parse auxiliary type string.");
+ }
+ }
+
+ public static string ToString(AuxiliaryType t)
+ {
+ switch (t) {
+ case AuxiliaryType.Fan:
+ return Constants.Auxiliaries.Names.Fan;
+ case AuxiliaryType.SteeringPump:
+ return Constants.Auxiliaries.Names.SteeringPump;
+ case AuxiliaryType.HVAC:
+ return Constants.Auxiliaries.Names.HeatingVentilationAirCondition;
+ case AuxiliaryType.PneumaticSystem:
+ return Constants.Auxiliaries.Names.PneumaticSystem;
+ case AuxiliaryType.ElectricSystem:
+ return Constants.Auxiliaries.Names.ElectricSystem;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index e797832d2f..592758e8df 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -32,11 +32,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs
index 1a81f39838..892732d581 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs
@@ -33,10 +33,10 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index 67b7a63dad..b1a536787d 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -32,10 +32,10 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
index 103366c330..da5dc761a0 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs
@@ -29,10 +29,10 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index eafe16f182..96478896ff 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -35,11 +35,11 @@ using System.Linq;
using System.Reflection;
using System.Security.Principal;
using System.Threading;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData;
using TUGraz.VectoCore.InputData.Reader.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
index 9a263a7605..fff6b6a007 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs
@@ -29,9 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
index d8db862435..ad1dc7fa06 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
@@ -33,8 +33,8 @@ using System.Collections.Generic;
using System.Data;
using System.Globalization;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index a82a13e463..68e96cfc50 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -30,8 +30,8 @@
*/
using System.ComponentModel.DataAnnotations;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
index 8b347a8f14..2acbfd9277 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
@@ -35,9 +35,9 @@ using System.Data;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
index 97e7077658..26d4774ea7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs
@@ -35,9 +35,9 @@ using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Diagnostics;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
index 68c9651fa4..2640bba728 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
@@ -35,10 +35,10 @@ using System.ComponentModel.DataAnnotations;
using System.Data;
using System.Diagnostics;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 4549537fac..9dec7cddfa 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -33,10 +33,10 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
index 3ef1e132e7..d2edb373da 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AMTShiftStrategy.cs
@@ -29,8 +29,8 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
index 701f350233..b0dd61dfe9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
@@ -29,9 +29,9 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 0ae451d710..f058ce1e32 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -31,10 +31,10 @@
using System;
using System.Collections.Generic;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index 0f1723bb0a..60df00dc2c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -30,10 +30,10 @@
*/
using System.Diagnostics;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 33742c9274..dccb117997 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -34,9 +34,9 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Windows.Markup;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
index 8a0086097e..0ca0f55654 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs
@@ -32,10 +32,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index 7c884e7482..beec23dfcf 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -31,10 +31,10 @@
using System;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index 5a723b2ad2..86cab7ebb7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -31,10 +31,10 @@
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
index 0ee15a39f3..95d534a251 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
@@ -32,10 +32,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
index 3a5210fca1..9a1aad7709 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs
@@ -31,9 +31,9 @@
using System;
using System.Drawing.Design;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index 36bfa34c6c..02596feeb2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -30,9 +30,9 @@
*/
using System;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
index acacfe7472..bc2aebf957 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
@@ -32,8 +32,8 @@
using System;
using System.Data;
using System.IO;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.FileIO
diff --git a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
index f32a41f59c..0d3b6e9723 100644
--- a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
+++ b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
@@ -36,10 +36,10 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
namespace TUGraz.VectoCore.Utils
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 228393c04f..9fa840bdcc 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -107,6 +107,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Configuration\Constants.cs" />
<Compile Include="InputData\FileIO\JSON\JsonExtensionMethods.cs" />
<Compile Include="InputData\Impl\InputData.cs" />
<Compile Include="InputData\FileIO\JSON\JSONEngineData.cs" />
@@ -125,6 +126,7 @@
<Compile Include="InputData\Reader\Impl\EngineeringModeVectoRunDataFactory.cs" />
<Compile Include="InputData\Reader\Impl\EngineOnlyVectoRunDataFactory.cs" />
<Compile Include="InputData\Reader\ShiftPolygonReader.cs" />
+ <Compile Include="Models\Declaration\AuxiliaryTypeHelper.cs" />
<Compile Include="Models\Connector\Ports\IDriverDemandPort.cs" />
<Compile Include="Models\Connector\Ports\IDrivingCyclePort.cs" />
<Compile Include="Models\Connector\Ports\Impl\Response.cs" />
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
index ac5ad1ed9a..44e6fedf96 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs
@@ -31,8 +31,8 @@
using System.Data;
using NUnit.Framework;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Tests.Utils;
diff --git a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
index 3e16bd5079..32f49f0fa4 100644
--- a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
@@ -32,9 +32,9 @@
using System.IO;
using System.Linq;
using NUnit.Framework;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index 6f1191df63..cf5529dab5 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -33,9 +33,9 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index cf0b7e5344..a24ab0bced 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -31,9 +31,9 @@
using System.Collections.Generic;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
index b6b5a2e6e3..eaf3bf38d3 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
@@ -33,9 +33,9 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using NUnit.Framework;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Simulation.Data;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 7ebc8b6418..06ba84cd14 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -32,9 +32,9 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Connector.Ports;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
index d721ac46a9..8ac0b94349 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs
@@ -32,10 +32,10 @@
using System;
using System.Linq;
using NUnit.Framework;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.Models.Declaration;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs
index 2856204c58..6e611b978c 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs
@@ -31,11 +31,10 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
{
diff --git a/VectoCore/VectoCoreTest/Utils/ShiftPolygonDrawer.cs b/VectoCore/VectoCoreTest/Utils/ShiftPolygonDrawer.cs
index 20e52c5a5a..994b829230 100644
--- a/VectoCore/VectoCoreTest/Utils/ShiftPolygonDrawer.cs
+++ b/VectoCore/VectoCoreTest/Utils/ShiftPolygonDrawer.cs
@@ -36,8 +36,8 @@ using System.Drawing;
using System.Linq;
using System.Runtime.InteropServices;
using System.Windows.Forms.DataVisualization.Charting;
-using TUGraz.VectoCommon.Configuration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using Point = TUGraz.VectoCommon.Utils.Point;
--
GitLab