diff --git a/.gitignore b/.gitignore index 259148f..b605f6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,347 @@ -# Prerequisites -*.d +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates +*.tlog +*.idb -# Compiled Object files -*.slo -*.lo -*.o -*.obj +<<<<<<< HEAD + + +# Large database/ANN files +*/*.dat +*/*.net + +# Ignore compiled/release files +*.lnk +*.zip +*.rar + +======= +>>>>>>> parent of a0859b2... Changed .gitignore to ignore large .db & .net files for now to prevent constant reuploads +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebugPublic/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* -# Precompiled Headers -*.gch +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj *.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- Backup*.rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app +# BeatPulse healthcheck temp database +healthchecksdb diff --git a/Fanna.sln b/Fanna.sln index d501c74..df7999f 100644 --- a/Fanna.sln +++ b/Fanna.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FannaTester", "FannaTester\FannaTester.vcxproj", "{C25D542C-1B4C-4586-B5F7-C00AF93670D8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fanna", "Fanna\Fanna.vcxproj", "{00686BAB-FAC3-42B1-B6FC-75F735F32ED9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,6 +23,14 @@ Global {C25D542C-1B4C-4586-B5F7-C00AF93670D8}.Release|x64.Build.0 = Release|x64 {C25D542C-1B4C-4586-B5F7-C00AF93670D8}.Release|x86.ActiveCfg = Release|Win32 {C25D542C-1B4C-4586-B5F7-C00AF93670D8}.Release|x86.Build.0 = Release|Win32 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Debug|x64.ActiveCfg = Debug|x64 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Debug|x64.Build.0 = Debug|x64 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Debug|x86.ActiveCfg = Debug|Win32 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Debug|x86.Build.0 = Debug|Win32 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Release|x64.ActiveCfg = Release|x64 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Release|x64.Build.0 = Release|x64 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Release|x86.ActiveCfg = Release|Win32 + {00686BAB-FAC3-42B1-B6FC-75F735F32ED9}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/x64/Debug/Fanna.dll b/x64/Debug/Fanna.dll new file mode 100644 index 0000000..4c3b9f0 Binary files /dev/null and b/x64/Debug/Fanna.dll differ diff --git a/x64/Debug/FannaTester.exe b/x64/Debug/FannaTester.exe new file mode 100644 index 0000000..b55a429 Binary files /dev/null and b/x64/Debug/FannaTester.exe differ diff --git a/x64/Debug/floatfann.dll b/x64/Debug/floatfann.dll new file mode 100644 index 0000000..60a4b2f Binary files /dev/null and b/x64/Debug/floatfann.dll differ diff --git a/x64/Release/Fanna.dll b/x64/Release/Fanna.dll new file mode 100644 index 0000000..3ce0d81 Binary files /dev/null and b/x64/Release/Fanna.dll differ diff --git a/x64/Release/FannaTester.exe b/x64/Release/FannaTester.exe new file mode 100644 index 0000000..277029b Binary files /dev/null and b/x64/Release/FannaTester.exe differ diff --git a/x64/Release/fannfloat.dll b/x64/Release/fannfloat.dll new file mode 100644 index 0000000..1ca65c8 Binary files /dev/null and b/x64/Release/fannfloat.dll differ diff --git a/x64/Release/kernel32.dll b/x64/Release/kernel32.dll new file mode 100644 index 0000000..544671f Binary files /dev/null and b/x64/Release/kernel32.dll differ diff --git a/x64/Release/msvcp140.dll b/x64/Release/msvcp140.dll new file mode 100644 index 0000000..934a210 Binary files /dev/null and b/x64/Release/msvcp140.dll differ diff --git a/x64/Release/vcruntime140.dll b/x64/Release/vcruntime140.dll new file mode 100644 index 0000000..34002d3 Binary files /dev/null and b/x64/Release/vcruntime140.dll differ