new 'benchmark' executable

git-svn-id: https://phat.googlecode.com/svn/trunk@49 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d

6 files changed, 950 insertions, 0 deletions

diff --git a/build/Visual Studio/VisualStudio2008.sln b/build/Visual Studio/VisualStudio2008.sln
index b325a17..10bc0b9 100644
--- a/build/Visual Studio/VisualStudio2008.sln
+++ b/build/Visual Studio/VisualStudio2008.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "self_test", "self_test\self
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple_example", "simple_example\simple_example.vcproj", "{EF3AAC07-A647-49F8-B6E0-DA9525C93569}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchmark", "benchmark\benchmark.vcproj", "{41BD21B0-A6E5-4446-AF0A-D64BAF097341}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -37,6 +39,13 @@ Global
 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|Win32.Build.0 = Release|Win32

 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|x64.ActiveCfg = Release|x64

 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|x64.Build.0 = Release|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|Win32.ActiveCfg = Debug|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|Win32.Build.0 = Debug|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|x64.ActiveCfg = Debug|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|Win32.ActiveCfg = Release|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|Win32.Build.0 = Release|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|x64.ActiveCfg = Release|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/build/Visual Studio/VisualStudio2012.sln b/build/Visual Studio/VisualStudio2012.sln
index 2282a26..226005b 100644
--- a/build/Visual Studio/VisualStudio2012.sln
+++ b/build/Visual Studio/VisualStudio2012.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "self_test", "self_test\self
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple_example", "simple_example\simple_example.vcxproj", "{EF3AAC07-A647-49F8-B6E0-DA9525C93569}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchmark", "benchmark\benchmark.vcxproj", "{41BD21B0-A6E5-4446-AF0A-D64BAF097341}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -39,6 +41,15 @@ Global
 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|Win32.Build.0 = Release|Win32

 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|x64.ActiveCfg = Release|x64

 		{EF3AAC07-A647-49F8-B6E0-DA9525C93569}.Release|x64.Build.0 = Release|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|Win32.ActiveCfg = Debug|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|Win32.Build.0 = Debug|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|x64.ActiveCfg = Debug|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Debug|x64.Build.0 = Debug|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|Win32.ActiveCfg = Release|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|Win32.Build.0 = Release|Win32

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|x64.ActiveCfg = Release|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|x64.Build.0 = Release|x64

+		{41BD21B0-A6E5-4446-AF0A-D64BAF097341}.Release|x64.Deploy.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/build/Visual Studio/benchmark/benchmark.vcproj b/build/Visual Studio/benchmark/benchmark.vcproj
new file mode 100644
index 0000000..f0a059c
--- /dev/null
+++ b/build/Visual Studio/benchmark/benchmark.vcproj
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="9,00"

+	Name="benchmark"

+	ProjectGUID="{41BD21B0-A6E5-4446-AF0A-D64BAF097341}"

+	RootNamespace="benchmark"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\..\include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory="$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\..\include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\..\include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="2"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="1"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="$(SolutionDir)\..\..\include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				LinkIncremental="1"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="17"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\..\src\benchmark.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\..\include\phat\boundary_matrix.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\phat\compute_persistence_pairs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\phat\persistence_pairs.h"

+				>

+			</File>

+			<Filter

+				Name="algorithms"

+				>

+				<File

+					RelativePath="..\..\..\include\phat\algorithms\chunk_reduction.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\algorithms\row_reduction.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\algorithms\standard_reduction.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\algorithms\twist_reduction.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="helpers"

+				>

+				<File

+					RelativePath="..\..\..\include\phat\helpers\dualize.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\helpers\misc.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\helpers\thread_local_storage.h"

+					>

+				</File>

+			</Filter>

+			<Filter

+				Name="representations"

+				>

+				<File

+					RelativePath="..\..\..\include\phat\representations\abstract_pivot_column.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\bit_tree_pivot_column.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\full_pivot_column.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\sparse_pivot_column.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\vector_list.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\vector_set.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\include\phat\representations\vector_vector.h"

+					>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/build/Visual Studio/benchmark/benchmark.vcxproj b/build/Visual Studio/benchmark/benchmark.vcxproj
new file mode 100644
index 0000000..6a997f3
--- /dev/null
+++ b/build/Visual Studio/benchmark/benchmark.vcxproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.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="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{41BD21B0-A6E5-4446-AF0A-D64BAF097341}</ProjectGuid>

+    <RootNamespace>benchmark</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <PlatformToolset>v110</PlatformToolset>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <PlatformToolset>v110</PlatformToolset>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <PlatformToolset>v110</PlatformToolset>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <PlatformToolset>v110</PlatformToolset>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir>$(Configuration)\</IntDir>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>

+    <IntDir>$(Configuration)\</IntDir>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(Configuration)\</IntDir>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader />

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader />

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader />

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader />

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>false</MultiProcessorCompilation>

+      <OpenMPSupport>true</OpenMPSupport>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\src\benchmark.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\include\phat\boundary_matrix.h" />

+    <ClInclude Include="..\..\..\include\phat\compute_persistence_pairs.h" />

+    <ClInclude Include="..\..\..\include\phat\persistence_pairs.h" />

+    <ClInclude Include="..\..\..\include\phat\algorithms\chunk_reduction.h" />

+    <ClInclude Include="..\..\..\include\phat\algorithms\row_reduction.h" />

+    <ClInclude Include="..\..\..\include\phat\algorithms\standard_reduction.h" />

+    <ClInclude Include="..\..\..\include\phat\algorithms\twist_reduction.h" />

+    <ClInclude Include="..\..\..\include\phat\helpers\dualize.h" />

+    <ClInclude Include="..\..\..\include\phat\helpers\misc.h" />

+    <ClInclude Include="..\..\..\include\phat\helpers\thread_local_storage.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\abstract_pivot_column.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\bit_tree_pivot_column.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\full_pivot_column.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\sparse_pivot_column.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\vector_list.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\vector_set.h" />

+    <ClInclude Include="..\..\..\include\phat\representations\vector_vector.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/build/Visual Studio/benchmark/benchmark.vcxproj.filters b/build/Visual Studio/benchmark/benchmark.vcxproj.filters
new file mode 100644
index 0000000..49aa1a8
--- /dev/null
+++ b/build/Visual Studio/benchmark/benchmark.vcxproj.filters
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+    <Filter Include="Header Files\algorithms">

+      <UniqueIdentifier>{85a93105-7834-415c-a6ca-8f42b9c3a661}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Header Files\helpers">

+      <UniqueIdentifier>{12278fbc-65bd-4d4b-bda3-55419edd30c7}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Header Files\representations">

+      <UniqueIdentifier>{b756daa0-c1db-420e-b32f-f5ed10d87b2a}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\src\benchmark.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\include\phat\boundary_matrix.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\compute_persistence_pairs.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\persistence_pairs.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\algorithms\chunk_reduction.h">

+      <Filter>Header Files\algorithms</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\algorithms\row_reduction.h">

+      <Filter>Header Files\algorithms</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\algorithms\standard_reduction.h">

+      <Filter>Header Files\algorithms</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\algorithms\twist_reduction.h">

+      <Filter>Header Files\algorithms</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\helpers\dualize.h">

+      <Filter>Header Files\helpers</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\helpers\misc.h">

+      <Filter>Header Files\helpers</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\helpers\thread_local_storage.h">

+      <Filter>Header Files\helpers</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\abstract_pivot_column.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\bit_tree_pivot_column.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\full_pivot_column.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\sparse_pivot_column.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\vector_list.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\vector_set.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\include\phat\representations\vector_vector.h">

+      <Filter>Header Files\representations</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
new file mode 100644
index 0000000..634fd4c
--- /dev/null
+++ b/src/benchmark.cpp
@@ -0,0 +1,222 @@
+/*  Copyright 2013 IST Austria

+    Contributed by: Ulrich Bauer, Michael Kerber, Jan Reininghaus

+

+    This file is part of PHAT.

+

+    PHAT is free software: you can redistribute it and/or modify

+    it under the terms of the GNU Lesser General Public License as published by

+    the Free Software Foundation, either version 3 of the License, or

+    (at your option) any later version.

+

+    PHAT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU Lesser General Public License for more details.

+

+    You should have received a copy of the GNU Lesser General Public License

+    along with PHAT.  If not, see <http://www.gnu.org/licenses/>. */

+

+#include <phat/compute_persistence_pairs.h>

+

+#include <phat/representations/vector_vector.h>

+#include <phat/representations/vector_set.h>

+#include <phat/representations/vector_list.h>

+#include <phat/representations/sparse_pivot_column.h>

+#include <phat/representations/full_pivot_column.h>

+#include <phat/representations/bit_tree_pivot_column.h>

+

+#include <phat/algorithms/twist_reduction.h>

+#include <phat/algorithms/standard_reduction.h>

+#include <phat/algorithms/row_reduction.h>

+#include <phat/algorithms/chunk_reduction.h>

+

+#include <iostream>

+#include <iomanip>

+

+

+enum Representation_type  {VECTOR_VECTOR, VECTOR_SET, SPARSE_PIVOT_COLUMN, FULL_PIVOT_COLUMN, BIT_TREE_PIVOT_COLUMN, VECTOR_LIST};

+enum Algorithm_type  {STANDARD, TWIST, ROW, CHUNK};

+enum Ansatz_type  {PRIMAL, DUAL};

+

+void print_help() {

+    std::cerr << "Usage: " << "benchmark " << "[options] input_filename_0 input_filename_1 ... input_filename_N" << std::endl;

+    std::cerr << std::endl;

+    std::cerr << "Options:" << std::endl;

+    std::cerr << std::endl;

+    std::cerr << "--ascii   --  use ascii file format" << std::endl;

+    std::cerr << "--binary  --  use binary file format (default)" << std::endl;

+    std::cerr << "--help    --  prints this screen" << std::endl;

+    std::cerr << "--dualize   --  use only dualization approach" << std::endl;

+    std::cerr << "--primal   --  use only primal approach" << std::endl;

+    std::cerr << "--vector_vector, --vector_set, --vector_list, --full_pivot_column, --sparse_pivot_column, --bit_tree_pivot_column  --  use only a subset of representation data structures for boundary matrices" << std::endl;

+    std::cerr << "--standard, --twist, --chunk, --row  --  use only a subset of reduction algorithms" << std::endl;

+}

+

+void print_help_and_exit() {

+    print_help();

+    exit( EXIT_FAILURE );

+}

+

+void parse_command_line( int argc, char** argv, bool& use_binary, std::vector< Representation_type >& representations, std::vector< Algorithm_type >& algorithms

+                       , std::vector< Ansatz_type >& ansaetze, std::vector< std::string >& input_filenames ) {

+

+    if( argc < 2 ) print_help_and_exit();

+

+    int number_of_options = 0;

+    for( int idx = 1; idx < argc; idx++ ) {

+        const std::string argument = argv[ idx ];

+        if( argument.size() > 2 && argument[ 0 ] == '-' && argument[ 1 ] == '-' ) {

+            if( argument == "--ascii" ) use_binary = false;

+            else if( argument == "--binary" ) use_binary = true;

+            else if( argument == "--vector_vector" ) representations.push_back( VECTOR_VECTOR );

+            else if( argument == "--vector_set" ) representations.push_back( VECTOR_SET );

+            else if( argument == "--vector_list" ) representations.push_back( VECTOR_LIST );

+            else if( argument == "--full_pivot_column" )  representations.push_back( FULL_PIVOT_COLUMN );

+            else if( argument == "--bit_tree_pivot_column" )  representations.push_back( BIT_TREE_PIVOT_COLUMN );

+            else if( argument == "--sparse_pivot_column" ) representations.push_back( SPARSE_PIVOT_COLUMN );

+            else if( argument == "--standard" ) algorithms.push_back( STANDARD );

+            else if( argument == "--twist" ) algorithms.push_back( TWIST );

+            else if( argument == "--row" ) algorithms.push_back( ROW );

+            else if( argument == "--chunk" ) algorithms.push_back( CHUNK );

+            else if( argument == "--primal" ) ansaetze.push_back( PRIMAL );

+            else if( argument == "--dual" ) ansaetze.push_back( DUAL );

+            else if( argument == "--help" ) print_help_and_exit();

+            else print_help_and_exit();

+        } else {

+            input_filenames.push_back( argument );

+        }

+    }

+

+    if( representations.empty() == true ) {

+        representations.push_back( VECTOR_VECTOR );

+        representations.push_back( VECTOR_SET );

+        representations.push_back( VECTOR_LIST );

+        representations.push_back( FULL_PIVOT_COLUMN );

+        representations.push_back( BIT_TREE_PIVOT_COLUMN );

+        representations.push_back( SPARSE_PIVOT_COLUMN );

+    }

+

+    if( algorithms.empty() == true ) {

+        algorithms.push_back( STANDARD );

+        algorithms.push_back( TWIST );

+        algorithms.push_back( ROW );

+        algorithms.push_back( CHUNK );

+    }

+    

+    if( ansaetze.empty() == true ) {

+        ansaetze.push_back( PRIMAL );

+        ansaetze.push_back( DUAL );

+    }

+}

+

+template<typename Representation, typename Algorithm>

+void compute( std::string input_filename,

+              bool use_binary,

+              Ansatz_type ansatz ) {

+

+    phat::boundary_matrix< Representation > matrix;

+    bool read_successful = use_binary ? matrix.load_binary( input_filename ) : matrix.load_ascii( input_filename );

+   

+    if( !read_successful ) {

+        std::cerr << std::endl << " Error opening file " << input_filename << std::endl;

+        print_help_and_exit();

+    }

+

+    double pairs_timer = omp_get_wtime();

+    phat::persistence_pairs pairs;

+    if( ansatz == PRIMAL ) {

+        std::cout << " primal";

+        phat::compute_persistence_pairs< Algorithm > ( pairs, matrix );

+    } else {

+        std::cout << " dual";

+        phat::compute_persistence_pairs_dualized< Algorithm > ( pairs, matrix );

+    }

+    std::cout << " " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << omp_get_wtime() - pairs_timer <<"s" << std::endl;

+}

+

+

+void benchmark( std::string input_filename, bool use_binary, Algorithm_type algorithm, Representation_type representation, Ansatz_type ansatz ) {

+    std::cout << input_filename;

+    

+    switch( representation ) {

+    case VECTOR_VECTOR:

+        std::cout << " vector_vector";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::vector_vector, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::vector_vector, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::vector_vector, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::vector_vector, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+

+    case VECTOR_SET:   

+        std::cout << " vector_set";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::vector_set, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::vector_set, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::vector_set, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::vector_set, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+    

+    case VECTOR_LIST:

+        std::cout << " vector_list";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::vector_list, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::vector_list, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::vector_list, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::vector_list, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+

+    case FULL_PIVOT_COLUMN:

+        std::cout << " full_pivot_column";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::full_pivot_column, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::full_pivot_column, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::full_pivot_column, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::full_pivot_column, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+

+    case BIT_TREE_PIVOT_COLUMN:

+        std::cout << " bit_tree_pivot_column";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::bit_tree_pivot_column, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::bit_tree_pivot_column, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::bit_tree_pivot_column, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::bit_tree_pivot_column, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+

+    case SPARSE_PIVOT_COLUMN:

+        std::cout << " sparse_pivot_column";

+        switch( algorithm ) {

+        case STANDARD: std::cout << " standard_reduction"; compute< phat::sparse_pivot_column, phat::standard_reduction >( input_filename, use_binary, ansatz ); break;

+        case TWIST: std::cout << " twist_reduction"; compute< phat::sparse_pivot_column, phat::twist_reduction >( input_filename, use_binary, ansatz ); break;

+        case ROW: std::cout << " row_reduction"; compute< phat::sparse_pivot_column, phat::row_reduction >( input_filename, use_binary, ansatz ); break;

+        case CHUNK: std::cout << " chunk_reduction"; compute< phat::sparse_pivot_column, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break;

+        } break;

+    }

+}

+

+int main( int argc, char** argv )

+{

+    bool use_binary = true; // interpret inputs as binary or ascii files

+    std::vector< std::string > input_filenames; // name of file that contains the boundary matrix

+

+    std::vector< Representation_type > representations; // representation class

+    std::vector< Algorithm_type > algorithms; // reduction algorithm

+    std::vector< Ansatz_type > ansaetze; // primal / dual

+

+    parse_command_line( argc, argv, use_binary, representations, algorithms, ansaetze, input_filenames );

+

+    for( int idx_input = 0; idx_input < input_filenames.size(); idx_input++ ) {

+        std::string input_filename = input_filenames[ idx_input ];

+        for( int idx_algorithm = 0; idx_algorithm < algorithms.size(); idx_algorithm++ ) {

+            Algorithm_type algorithm = algorithms[ idx_algorithm ];

+            for( int idx_representation = 0; idx_representation < representations.size(); idx_representation++ ) {

+                Representation_type representation = representations[ idx_representation ];

+                for( int idx_ansatz = 0; idx_ansatz < ansaetze.size(); idx_ansatz++ ) {

+                    Ansatz_type ansatz = ansaetze[ idx_ansatz ];

+                    benchmark( input_filename, use_binary, algorithm, representation, ansatz );

+                }

+            }

+        }

+    }

+}