[mlpack-git] master: mlpack build (2d9ef25)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Tue Nov 24 11:39:39 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/c627ed77fb6d805bba31768003d3dcfea2a1685c...79e4132962eaef5ed3b4bea36d42ebd5292dea92
>---------------------------------------------------------------
commit 2d9ef25e0c3719e1aa68830dfb263e718bdf687a
Author: theSundayProgrammer <joe.mariadassou at gmail.com>
Date: Sat Nov 21 18:41:57 2015 +1100
mlpack build
Conflicts:
.gitignore
>---------------------------------------------------------------
2d9ef25e0c3719e1aa68830dfb263e718bdf687a
.gitignore | 1 +
mlpack.vcxproj | 448 +++++++++++++++++++++++++++
src/mlpack/methods/range_search/rs_model.cpp | 12 +-
3 files changed, 455 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 59a9fb7..19b7551 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ build*
*~
.*.swp
.*.swo
+*.bak
src/mlpack/core/util/gitversion.hpp
src/mlpack/core/util/arma_config.hpp
diff --git a/mlpack.vcxproj b/mlpack.vcxproj
new file mode 100644
index 0000000..cebdf73
--- /dev/null
+++ b/mlpack.vcxproj
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="RelWithDebInfo|Win32">
+ <Configuration>RelWithDebInfo</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="RelWithDebInfo|x64">
+ <Configuration>RelWithDebInfo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGUID>{1FF218C4-F498-4047-9E78-62455072F33C}</ProjectGUID>
+ <Keyword>Win32Proj</Keyword>
+ <Platform>Win32</Platform>
+ <ProjectName>mlpack</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup 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>10.0.20506.1</_ProjectFileVersion>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mlpack</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.lib</TargetExt>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mlpack</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.lib</TargetExt>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <IncludePath>c:\usr\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+ </PropertyGroup>
+
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>C:\Projects\CPP\mlpack_original\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <CompileAs>CompileAsCpp</CompileAs>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+ <Optimization>Disabled</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>.\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>.\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Release/</AssemblerListingLocation>
+ <CompileAs>CompileAsCpp</CompileAs>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <Optimization>MaxSpeed</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>.\src\mlpack\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ </ItemDefinitionGroup>
+
+ <ItemGroup>
+ <ClInclude Include=".\src\mlpack\core.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\arma_extend.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\fn_ccov.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\glue_ccov_meat.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\glue_ccov_proto.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\hdf5_misc.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\op_ccov_meat.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\op_ccov_proto.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\operator_minus.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\promote_type.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\restrictors.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\typedef.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\SpMat_extra_bones.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\SpMat_extra_meat.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\Mat_extra_bones.hpp" />
+ <ClInclude Include=".\src\mlpack\core\arma_extend\Mat_extra_meat.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\extension.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\format.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\load.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\load_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\normalize_labels.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\normalize_labels_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\save.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\save_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\data\serialization_shim.hpp" />
+ <ClInclude Include=".\src\mlpack\core\dists\discrete_distribution.hpp" />
+ <ClInclude Include=".\src\mlpack\core\dists\gaussian_distribution.hpp" />
+ <ClInclude Include=".\src\mlpack\core\dists\laplace_distribution.hpp" />
+ <ClInclude Include=".\src\mlpack\core\dists\regression_distribution.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\cosine_distance.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\cosine_distance_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\epanechnikov_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\epanechnikov_kernel_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\example_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\gaussian_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\hyperbolic_tangent_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\kernel_traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\laplacian_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\linear_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\polynomial_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\pspectrum_string_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\pspectrum_string_kernel_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\spherical_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\kernels\triangular_kernel.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\clamp.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\lin_alg.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\lin_alg_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\random.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\random_basis.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\range.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\range_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\math\round.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\ip_metric.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\ip_metric_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\lmetric.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\lmetric_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\mahalanobis_distance.hpp" />
+ <ClInclude Include=".\src\mlpack\core\metrics\mahalanobis_distance_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian_function.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian_function_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian_test_functions.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\lbfgs\lbfgs_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\lbfgs\lbfgs.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\lbfgs\test_functions.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sa\sa.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sa\sa_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sa\exponential_schedule.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\lrsdp.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\lrsdp_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\lrsdp_function.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\lrsdp_function_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\primal_dual.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\primal_dual_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\sdp.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sdp\sdp_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sgd\sgd.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sgd\sgd_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\optimizers\sgd\test_function.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\ballbound.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\ballbound_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\binary_space_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\binary_space_tree_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\breadth_first_dual_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\breadth_first_dual_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\dual_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\dual_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\mean_split.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\mean_split_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\midpoint_split.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\midpoint_split_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\single_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\single_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\binary_space_tree\typedef.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\bounds.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\bound_traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cosine_tree\cosine_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\cover_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\cover_tree_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\first_point_is_root.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\single_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\single_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\dual_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\dual_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\cover_tree\typedef.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\example_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\hrectbound.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\hrectbound_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\rectangle_tree.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\rectangle_tree_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\single_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\single_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\dual_tree_traverser.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\dual_tree_traverser_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_tree_split.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_tree_split_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_tree_descent_heuristic.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_tree_descent_heuristic_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_star_tree_descent_heuristic.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_star_tree_descent_heuristic_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_star_tree_split.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\r_star_tree_split_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\x_tree_split.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\rectangle_tree\x_tree_split_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\statistic.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\traversal_info.hpp" />
+ <ClInclude Include=".\src\mlpack\core\tree\tree_traits.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\arma_config.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\arma_config_check.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\cli.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\cli_deleter.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\cli_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\log.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\nulloutstream.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\option.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\option_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\ostream_extra.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\prefixedoutstream.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\prefixedoutstream_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\sfinae_utility.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\string_util.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\timers.hpp" />
+ <ClInclude Include=".\src\mlpack\core\util\version.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\adaboost\adaboost.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\adaboost\adaboost_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\amf\amf.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\amf\amf_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\ann\ffn.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\ann\cnn.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\ann\network_traits.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\cf\cf.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\cf\cf_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\cf\svd_wrapper.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\cf\svd_wrapper_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\decision_stump\decision_stump.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\decision_stump\decision_stump_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\det\dtree.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\det\dt_utils.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\union_find.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\dtb.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\dtb_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\dtb_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\dtb_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\dtb_stat.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\emst\edge_pair.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\fastmks\fastmks.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\fastmks\fastmks_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\fastmks\fastmks_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\fastmks\fastmks_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\gmm.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\gmm_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\em_fit.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\em_fit_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\no_constraint.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\positive_definite_constraint.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\diagonal_constraint.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\eigenvalue_ratio_constraint.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\gmm\gmm_util.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm_regression.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm_regression_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm_util.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\hmm\hmm_util_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kernel_pca\kernel_pca.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kernel_pca\kernel_pca_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\allow_empty_clusters.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\dual_tree_kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\dual_tree_kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\dual_tree_kmeans_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\dual_tree_kmeans_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\dual_tree_kmeans_statistic.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\elkan_kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\elkan_kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\hamerly_kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\hamerly_kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\max_variance_new_cluster.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\max_variance_new_cluster_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\naive_kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\naive_kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\pelleg_moore_kmeans.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\pelleg_moore_kmeans_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\pelleg_moore_kmeans_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\pelleg_moore_kmeans_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\pelleg_moore_kmeans_statistic.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\random_partition.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\refined_start.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\kmeans\refined_start_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\mean_shift\mean_shift.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\mean_shift\mean_shift_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\lars\lars.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\linear_regression\linear_regression.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\local_coordinate_coding\lcc.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\local_coordinate_coding\lcc_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\logistic_regression\logistic_regression.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\logistic_regression\logistic_regression_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\logistic_regression\logistic_regression_function.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\logistic_regression\logistic_regression_function_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\matrix_completion\matrix_completion.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\naive_bayes\naive_bayes_classifier.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\naive_bayes\naive_bayes_classifier_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nca\nca.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nca\nca_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nca\nca_softmax_error_function.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nca\nca_softmax_error_function_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\neighbor_search.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\neighbor_search_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\neighbor_search_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\neighbor_search_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\neighbor_search_stat.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\ns_model.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\ns_model_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\ns_traversal_info.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\sort_policies\nearest_neighbor_sort.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\sort_policies\nearest_neighbor_sort_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\sort_policies\furthest_neighbor_sort.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\sort_policies\furthest_neighbor_sort_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\typedef.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\neighbor_search\unmap.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\pca\pca.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\perceptron\perceptron.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\perceptron\perceptron_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\quic_svd\quic_svd.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\quic_svd\quic_svd_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\radical\radical.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\range_search.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\range_search_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\range_search_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\range_search_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\range_search_stat.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\rs_model.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\range_search\rs_model_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_search.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_search_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_search_rules.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_search_rules_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_query_stat.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_typedef.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\rann\ra_util.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\regularized_svd\regularized_svd.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\regularized_svd\regularized_svd_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\regularized_svd\regularized_svd_function.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\softmax_regression\softmax_regression.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\softmax_regression\softmax_regression_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\softmax_regression\softmax_regression_function.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_autoencoder\sparse_autoencoder.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_autoencoder\sparse_autoencoder_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_autoencoder\sparse_autoencoder_function.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_coding\data_dependent_random_initializer.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_coding\nothing_initializer.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_coding\random_initializer.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_coding\sparse_coding.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\sparse_coding\sparse_coding_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nystroem_method\nystroem_method.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nystroem_method\nystroem_method_impl.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nystroem_method\ordered_selection.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nystroem_method\random_selection.hpp" />
+ <ClInclude Include=".\src\mlpack\methods\nystroem_method\kmeans_selection.hpp" />
+ <ClCompile Include=".\src\mlpack\core\dists\discrete_distribution.cpp" />
+ <ClCompile Include=".\src\mlpack\core\dists\gaussian_distribution.cpp" />
+ <ClCompile Include=".\src\mlpack\core\dists\laplace_distribution.cpp" />
+ <ClCompile Include=".\src\mlpack\core\dists\regression_distribution.cpp" />
+ <ClCompile Include=".\src\mlpack\core\kernels\epanechnikov_kernel.cpp" />
+ <ClCompile Include=".\src\mlpack\core\kernels\pspectrum_string_kernel.cpp" />
+ <ClCompile Include=".\src\mlpack\core\math\lin_alg.cpp" />
+ <ClCompile Include=".\src\mlpack\core\math\random.cpp" />
+ <ClCompile Include=".\src\mlpack\core\math\random_basis.cpp" />
+ <ClCompile Include=".\src\mlpack\core\optimizers\aug_lagrangian\aug_lagrangian_test_functions.cpp" />
+ <ClCompile Include=".\src\mlpack\core\optimizers\lbfgs\test_functions.cpp" />
+ <ClCompile Include=".\src\mlpack\core\optimizers\sgd\test_function.cpp" />
+ <ClCompile Include=".\src\mlpack\core\tree\cosine_tree\cosine_tree.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\cli.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\cli_deleter.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\log.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\option.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\prefixedoutstream.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\string_util.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\timers.cpp" />
+ <ClCompile Include=".\src\mlpack\core\util\version.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\det\dtree.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\det\dt_utils.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\lars\lars.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\linear_regression\linear_regression.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\matrix_completion\matrix_completion.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\neighbor_search\sort_policies\nearest_neighbor_sort.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\neighbor_search\sort_policies\furthest_neighbor_sort.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\neighbor_search\unmap.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\pca\pca.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\radical\radical.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\range_search\rs_model.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\rann\ra_util.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\regularized_svd\regularized_svd_function.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\softmax_regression\softmax_regression_function.cpp" />
+ <ClCompile Include=".\src\mlpack\methods\sparse_autoencoder\sparse_autoencoder_function.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/mlpack/methods/range_search/rs_model.cpp b/src/mlpack/methods/range_search/rs_model.cpp
index c28a477..ac98ad7 100644
--- a/src/mlpack/methods/range_search/rs_model.cpp
+++ b/src/mlpack/methods/range_search/rs_model.cpp
@@ -69,8 +69,8 @@ void RSModel::BuildModel(arma::mat&& referenceSet,
else
{
vector<size_t> oldFromNewReferences;
- typename RSType<tree::KDTree>::Tree* kdTree =
- new typename RSType<tree::KDTree>::Tree(move(referenceSet),
+ RSType<tree::KDTree>::Tree* kdTree =
+ new RSType<tree::KDTree>::Tree(move(referenceSet),
oldFromNewReferences, leafSize);
kdTreeRS = new RSType<tree::KDTree>(kdTree, singleMode);
@@ -106,8 +106,8 @@ void RSModel::BuildModel(arma::mat&& referenceSet,
else
{
vector<size_t> oldFromNewReferences;
- typename RSType<tree::BallTree>::Tree* ballTree =
- new typename RSType<tree::BallTree>::Tree(move(referenceSet),
+ RSType<tree::BallTree>::Tree* ballTree =
+ new RSType<tree::BallTree>::Tree(move(referenceSet),
oldFromNewReferences, leafSize);
ballTreeRS = new RSType<tree::BallTree>(ballTree, singleMode);
@@ -154,7 +154,7 @@ void RSModel::Search(arma::mat&& querySet,
Timer::Start("tree_building");
Log::Info << "Building query tree..." << endl;
vector<size_t> oldFromNewQueries;
- typename RSType<tree::KDTree>::Tree queryTree(move(querySet),
+ RSType<tree::KDTree>::Tree queryTree(move(querySet),
oldFromNewQueries, leafSize);
Log::Info << "Tree built." << endl;
Timer::Stop("tree_building");
@@ -198,7 +198,7 @@ void RSModel::Search(arma::mat&& querySet,
Timer::Start("tree_building");
Log::Info << "Building query tree..." << endl;
vector<size_t> oldFromNewQueries;
- typename RSType<tree::BallTree>::Tree queryTree(move(querySet),
+ RSType<tree::BallTree>::Tree queryTree(move(querySet),
oldFromNewQueries, leafSize);
Log::Info << "Tree built." << endl;
Timer::Stop("tree_building");
More information about the mlpack-git
mailing list