Merge pull request #17 in VECTO/vecto-sim from...

Merge pull request #17 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-55-include-logging-facility to develop

* commit '53be1077':
  include logging also in test project
  include nlog, common.logging (nupackages)
  adding test class, first models
  More work on class diagram, first empty classes
  Adding empty classes for basic namespace structure
  added first version of class diagram and high-level sequence diagram

VECTO.sln

 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
 EndProject
+Project("{F088123C-0E9E-452A-89E6-6BA2F21D5CAC}") = "VectoCoreArchitecture", "VectoCoreArchitecture\VectoCoreArchitecture.modelproj", "{165DA769-0FC8-44A7-87D6-58D037E765AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCoreTest", "VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,6 +27,24 @@ Global
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x86.ActiveCfg = Release|x86
 		{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|x86.Build.0 = Release|x86
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{165DA769-0FC8-44A7-87D6-58D037E765AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

VectoCore/Exceptions/VectoSimulationException.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Exceptions
+{
+	class VectoSimulationException : Exception
+	{
+
+	}
+}

VectoCore/Models/Connector/Connector.cs

+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+
+namespace TUGraz.VectoCore.Models.Connector
+{
+	class Connector<TI, TO, TP> 
+		where TI : InPort, TP
+		where TO : OutPort, TP
+	{
+		protected TI InPort;
+		protected TO OutPort;
+
+	}
+
+}

VectoCore/Models/Connector/Ports/ITnPort.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports
+{
+	interface ITnPort
+	{
+	}
+
+	interface ITnInPort : ITnPort
+	{
+		
+	}
+
+	interface ITnOutPort : ITnPort
+	{
+		
+	}
+}

VectoCore/Models/Connector/Ports/Impl/InPort.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
+{
+	public abstract class InPort
+	{
+	}
+}

VectoCore/Models/Connector/Ports/Impl/OutPort.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
+{
+	public abstract class OutPort
+	{
+	}
+}

VectoCore/Models/Connector/Ports/Impl/Port.cs

+namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
+{
+	abstract class Port
+	{
+	}
+}

VectoCore/Models/Connector/Ports/Impl/TnInPort.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
+{
+	public class TnInPort : InPort, ITnInPort
+	{
+	}
+}

VectoCore/Models/Connector/Ports/Impl/TnOutPort.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.Connector.Ports.Impl
+{
+	public class TnOutPort : OutPort, ITnOutPort
+	{
+	}
+}

VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Data
+{
+	public class CombustionEngineData : SimulationComponentData
+	{
+		/// <summary>
+		/// Engine description (e.g., mode, type, etc.
+		/// </summary>
+		public String ModelName { get; protected set; }
+		
+		/// <summary>
+		/// Engine displacement [ccm]
+		/// </summary>
+		public double Displacement { get; protected set; }
+
+		public double IdleSpeed { get; protected set; }
+
+		public double RatedSpeed { get; protected set; }
+
+		public double Inertia { get; protected set; }
+
+		public double MaxPower { get; set; }
+
+		public FuelConsumptionMap ConsumptionMap { get; protected set; }
+
+		public FullLoadCurve FullLoadCurve(uint gear)
+		{
+			throw new NotImplementedException("get FullLoadCurve for gear");
+		}
+	}
+}

VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
+{
+	public class FuelConsumptionMap
+	{
+	}
+}

VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
+{
+	public class FullLoadCurve
+	{
+	}
+}

VectoCore/Models/SimulationComponent/ICombustionEngine.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent
+{
+	interface ICombustionEngine
+	{
+
+	}
+}

VectoCore/Models/SimulationComponent/IWheels.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent
+{
+	interface IWheels
+	{
+	}
+}

VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+	public class CombustionEngine : VectoSimulationComponent, ICombustionEngine
+	{
+		public CombustionEngine(CombustionEngineData data)
+		{
+
+		}
+
+		public override InPort InPort()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override OutPort OutPort()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

VectoCore/Models/SimulationComponent/Impl/Wheels.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
+{
+	class Wheels : VectoSimulationComponent
+	{
+		public override Connector.Ports.Impl.InPort InPort()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override Connector.Ports.Impl.OutPort OutPort()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

VectoCore/Models/SimulationComponent/SimulationComponentData.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Common.Logging;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent
+{
+	public class SimulationComponentData
+	{
+		protected ILog Logger;
+
+		public SimulationComponentData()
+		{
+			Logger = LogManager.GetLogger(this.GetType());
+		}
+
+	}
+}

VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using TUGraz.VectoCore.Models.Connector;
+using TUGraz.VectoCore.Models.Connector.Ports;
+using TUGraz.VectoCore.Models.Connector.Ports.Impl;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent
+{
+	public abstract class VectoSimulationComponent
+	{
+		abstract public InPort InPort();
+		abstract public OutPort OutPort();
+
+	}
+
+}

VectoCore/Properties/AssemblyInfo.cs

+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("VectoCore")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("VectoCore")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b843f4c2-660b-4a3e-a336-c1f9c20aa993")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

VectoCore/VectoCore.csproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TUGraz.VectoCore</RootNamespace>
+    <AssemblyName>VectoCore</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging">
+      <HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging.Core">
+      <HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging.NLog31">
+      <HintPath>..\packages\Common.Logging.NLog31.3.0.0\lib\net40\Common.Logging.NLog31.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Exceptions\VectoSimulationException.cs" />
+    <Compile Include="Models\Connector\Connector.cs" />
+    <Compile Include="Models\Connector\Ports\Impl\InPort.cs" />
+    <Compile Include="Models\Connector\Ports\Impl\OutPort.cs" />
+    <Compile Include="Models\Connector\Ports\Impl\TnInPort.cs" />
+    <Compile Include="Models\Connector\Ports\Impl\TnOutPort.cs" />
+    <Compile Include="Models\Connector\Ports\ITnPort.cs" />
+    <Compile Include="Models\SimulationComponent\Data\CombustionEngineData.cs" />
+    <Compile Include="Models\SimulationComponent\Data\Engine\FuelConsumptionMap.cs" />
+    <Compile Include="Models\SimulationComponent\Data\Engine\FullLoadCurve.cs" />
+    <Compile Include="Models\SimulationComponent\ICombustionEngine.cs" />
+    <Compile Include="Models\SimulationComponent\Impl\CombustionEngine.cs" />
+    <Compile Include="Models\SimulationComponent\Impl\Wheels.cs" />
+    <Compile Include="Models\SimulationComponent\IWheels.cs" />
+    <Compile Include="Models\SimulationComponent\SimulationComponentData.cs" />
+    <Compile Include="Models\SimulationComponent\VectoSimulationComponent.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file