Skip to content

Final: first version. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JadrankoLucic wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Final: first version. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f1b3e5
Final: first version.
Nov 24, 2018
5524ccb
Final:
Nov 28, 2018
21d7a99
Jan's comments are resolved.
Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions final/final.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{DD752318-EA08-4316-9EFE-C1A42F5526F4}"
ProjectSection(ProjectDependencies) = postProject
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF} = {6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tool", "tool\tool.vcxproj", "{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Debug|x64.ActiveCfg = Debug|Win32
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Debug|x86.ActiveCfg = Debug|Win32
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Debug|x86.Build.0 = Debug|Win32
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Release|x64.ActiveCfg = Release|Win32
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Release|x86.ActiveCfg = Release|Win32
{DD752318-EA08-4316-9EFE-C1A42F5526F4}.Release|x86.Build.0 = Release|Win32
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Debug|x64.ActiveCfg = Debug|x64
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Debug|x64.Build.0 = Debug|x64
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Debug|x86.ActiveCfg = Debug|Win32
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Debug|x86.Build.0 = Debug|Win32
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Release|x64.ActiveCfg = Release|x64
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Release|x64.Build.0 = Release|x64
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Release|x86.ActiveCfg = Release|Win32
{6E9AF5D3-751C-446F-B351-8C0DEE50AFAF}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FDE21BA4-D7CE-47C7-96EA-E00553A83F88}
EndGlobalSection
EndGlobal
8 changes: 8 additions & 0 deletions final/tests/tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include <vector>
#include <list>
#include "tests.h"
#include <set>
#include <map>
#include <locale>
#include <algorithm>

5 changes: 5 additions & 0 deletions final/tests/tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pragma once
#include <string>
#include <vector>
#include <list>
#include <map>
105 changes: 105 additions & 0 deletions final/tests/tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DD752318-EA08-4316-9EFE-C1A42F5526F4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>e01</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>..\$(Configuration)\$(Platform)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>..\$(Configuration)\$(Platform)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\tool\block.cpp" />
<ClCompile Include="..\tool\block_add.cpp" />
<ClCompile Include="..\tool\block_lim.cpp" />
<ClCompile Include="..\tool\block_mult.cpp" />
<ClCompile Include="..\tool\block_neg.cpp" />
<ClCompile Include="..\tool\block_queq.cpp" />
<ClCompile Include="tests.cpp" />
<ClCompile Include="tool_test.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="tests.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
129 changes: 129 additions & 0 deletions final/tests/tool_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#include "CppUnitTest.h"
#include <numeric>
using namespace Microsoft::VisualStudio::CppUnitTestFramework;

#include "tests.h"
#include <sstream>
#include <algorithm>
#include "..\tool\block.h"

TEST_CLASS(test_tool)
{
public:
TEST_METHOD(test_add)
{
block_processor bp;
//std::vector<double> p;
//p.push_back(5);
std::unique_ptr<block> block_add = block_factory::create("add", { 5 });
bp.add_block(std::move(block_add));
double res = bp.calc_all(5.);
Assert::AreEqual(10., res);
}

TEST_METHOD(test_lim_lower)
{
block_processor bp;
std::unique_ptr<block> block_lim = block_factory::create("lim", { 5, 10 });
bp.add_block(std::move(block_lim));
double res = bp.calc_all(4.);
Assert::AreEqual(5., res);
}

TEST_METHOD(test_lim_between)
{
block_processor bp;
std::unique_ptr<block> block_lim = block_factory::create("lim", { 5, 10 });
bp.add_block(std::move(block_lim));
double res = bp.calc_all(7.);
Assert::AreEqual(7., res);
}

TEST_METHOD(test_lim_upper)
{
block_processor bp;
std::unique_ptr<block> block_lim = block_factory::create("lim", { 5, 10 });
bp.add_block(std::move(block_lim));
double res = bp.calc_all(17.);
Assert::AreEqual(10., res);
}
TEST_METHOD(test_calc_all)
{
block_processor bp;
std::unique_ptr<block> block_add = block_factory::create("add", { 2 });
std::unique_ptr<block> block_mult = block_factory::create("mult", { 2 });
bp.add_block(std::move(block_add));
bp.add_block(std::move(block_mult));
double res = bp.calc_all(1.);
Assert::AreEqual(6., res);
}

TEST_METHOD(test_get_block_infos)
{
std::vector<std::string> abl = block_factory::get_block_infos();
Assert::IsTrue(std::any_of(abl.begin(), abl.end(),
[](std::string const& s)
{
return s.compare(0, 3, "add") == 0;
}));
}

TEST_METHOD(test_bulk_calc_with_add_block)
{
//create block processor with 'add' block
const double add_parameter = 5.;
block_processor bp;
std::unique_ptr<block> bl = block_factory::create("add", { add_parameter });
bp.add_block(std::move(bl));

//prepare input values
std::vector<double> inputs{1,2,3};
std::stringstream input_ss;
for (auto it = inputs.begin(); it != inputs.end(); ++it)
input_ss << *it << std::endl;

//validate return value from bulk_calc
std::stringstream output_ss;
Assert::AreEqual(bp.bulk_calc(input_ss, output_ss), true);

//validate output values
double output_value;
std::vector<double> outputs;
std::string output_line;

//check that all output values are doubles
std::istringstream line_stream;
while (std::getline(output_ss, output_line)) {
std::stringstream output_value_ss(output_line);
if (output_value_ss >> output_value)
outputs.push_back(output_value);
else
Assert::Fail(L"output is wrong");
}

//check input and output sizes
Assert::AreEqual(outputs.size() == 3, true);

//compare and validate each value
const bool is_equal = std::equal(outputs.begin(), outputs.end(), inputs.begin(),
[add_parameter](double &vo, double &vi)
{
return add_parameter + vi == vo;
});

Assert::AreEqual(is_equal, true);
}

TEST_METHOD(test_load_sequence)
{
const double add_parameter = 5.;
block_processor bp;

std::stringstream input_ss("add 5\nmult 2");
Assert::AreEqual(bp.load_from_stream(input_ss), true);

//check bp size
auto seq = bp.get_sequence();
Assert::AreEqual(seq.size() == 2, true);
}
};
Loading