Pull request #208: Feature/VECTO-1577 define inputdatainterfaces

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:feature/VECTO-1577-define-inputdatainterfaces to develop

* commit '01d26d1e':
  adding generic IEPC json file
  define iepc engineering input data input data interface
  convert projects back to .net 5.0

HashingCmd/HashingCmd.csproj

@@ -6,7 +6,7 @@
 
     <RootNamespace>HashingCmd</RootNamespace>
     <AssemblyName>hashingcmd</AssemblyName>
-    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
     <DefineConstants />
     <OutputType>Exe</OutputType>
   </PropertyGroup>

VECTO/VECTO.vbproj

@@ -8,7 +8,7 @@
     <OptionStrict>On</OptionStrict>
     <UseWindowsForms>true</UseWindowsForms>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
     <DefineTrace>false</DefineTrace>
     <DefineConstants />

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

@@ -484,6 +484,12 @@ namespace TUGraz.VectoCommon.InputData
 		new IList<ElectricMachineEntry<IElectricMotorEngineeringInputData>> Entries { get; }
 	}
 
+
+	public interface IIEPCEngineeringInputData : IIEPCDeclarationInputData
+	{
+		double OverloadRecoveryFactor { get; }
+	}
+
 	public interface IElectricStorageEngineeringInputData : IElectricStorageDeclarationInputData
 	{
 

VectoCommon/VectoCommon/VectoCommon.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCommon</RootNamespace>
     <AssemblyName>VectoCommon</AssemblyName>
-    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 

VectoCommon/VectoHashing/VectoHashing.csproj

@@ -6,7 +6,7 @@
 
     <RootNamespace>TUGraz.VectoHashing</RootNamespace>
     <AssemblyName>VectoHashing</AssemblyName>
-    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 

VectoCommon/VectoHashingTest/VectoHashingTest.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>VectoHashingTest</RootNamespace>
     <AssemblyName>VectoHashingTest</AssemblyName>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 

VectoCore/VectoCore/VectoCore.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCore</RootNamespace>
     <AssemblyName>VectoCore</AssemblyName>
-    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
   <ItemGroup>

VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs

@@ -28,7 +28,6 @@ using TUGraz.VectoCore.OutputData.FileIO;
 using TUGraz.VectoCore.Tests.Models.SimulationComponentData;
 using TUGraz.VectoCore.Tests.Utils;
 using TUGraz.VectoCore.Utils;
-using static System.Formats.Asn1.AsnWriter;
 using ElectricSystem = TUGraz.VectoCore.Models.SimulationComponent.ElectricSystem;
 
 

VectoCore/VectoCoreTest/TestData/Hybrids/IEPC/GenericIEPC.viepc

+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2016-10-13T08:54:28.7387223Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic IEPC",
+    "Inertia": 0.15,
+    "DifferentialIncluded": false,
+    "DesignTypeWheelMotor": false,
+    "NrOfDesignTypeWheelMotorMeasured": 1,
+    "ThermalOverloadRecoveryFactor": 0.9
+    "Gears": [
+        {
+        "Ratio": 3.2,
+        "MaxOutShaftTorque": 10000,
+        "MaxOutShaftSpeed": 5000
+        },
+        {
+        "Ratio": 1.6,
+        "MaxOutShaftTorque": 10000,
+        "MaxOutShaftSpeed": 5000
+        }
+        {
+        "Ratio": 1.6,
+        "MaxOutShaftTorque": 10000,
+        "MaxOutShaftSpeed": 5000
+        }
+    ]
+    "VoltageLevels" [
+     {
+        "Voltage": 400,
+        "ContinuousTorque": 200,
+        "ContinuoursTorqueSpeed": 2000
+        "OverloadTorque": 500,
+        "OverloadTorqueSpeed": 2000,
+        "OverloadTime": 60,
+        "FullLoadCurve": "GenericIEPC.viepcp"
+        "PowerMaps": {
+            "1": "PowerMap1.viepco",
+            "2": "PowerMap1.viepco",
+            "3": "PowerMap1.viepco",
+        }
+     },
+     {
+        "Voltage": 800,
+        "ContinuousTorque": 200,
+        "ContinuoursTorqueSpeed": 2000
+        "OverloadTorque": 500,
+        "OverloadTorqueSpeed": 2000,
+        "OverloadTime": 60,
+        "FullLoadCurve": "GenericIEPC.viepcp"
+        "PowerMaps": {
+            "1": "PowerMap1.viepco",
+            "2": "PowerMap1.viepco",
+            "3": "PowerMap1.viepco",
+        }
+     }
+    ]
+    
+    "DragCurves":  {
+        "1": "GenericDrag.viepcd",
+        "2": "GenericDrag.viepcd",
+        "3": "GenericDrag.viepcd",
+    },
+  }
+}
\ No newline at end of file

VectoCore/VectoCoreTest/Utils/GraphWriter.cs

@@ -387,8 +387,14 @@ namespace TUGraz.VectoCore.Tests.Utils
 				.ToArray();
 		}
 
-		private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping) =>
-			modDataV3.Rows.Cast<DataRow>().Select(x => mapping.GetValueOrDefault(((string)x[field]), double.NaN)).ToArray();
+		//private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping) =>
+		//	modDataV3.Rows.Cast<DataRow>().Select(x => mapping.GetValueOrDefault(((string)x[field]), double.NaN)).ToArray();
+		private static double[] LoadDataMapped(DataTable modDataV3, string field, Dictionary<string, double> mapping)
+		{
+			return (from x in modDataV3.Rows.Cast<DataRow>()
+				let val = x.Field<string>(field)
+				select mapping.ContainsKey(val) ? mapping[val] : double.NaN).ToArray();
+		}
 
 		private static void AlignChart(Chart chart, string chartToAlign, string chartToAlignWith)
 		{

VectoCore/VectoCoreTest/VectoCoreTest.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
     <AssemblyName>VectoCoreTest</AssemblyName>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net48</TargetFramework>
     <DefineConstants />
   </PropertyGroup>
 
@@ -24,4 +24,11 @@
     <None Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="System.Windows.Forms">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Windows.Forms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms.DataVisualization" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file