Skip to content
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

Jump to bottom

Spill trees #747

Merged
merged 84 commits into from Aug 18, 2016
Merged

Spill trees #747

merged 84 commits into from Aug 18, 2016

Commits on Aug 1, 2016

  1. Add Spill Trees, based on binary space trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    8adae19 View commit details
    Browse the repository at this point in the history

  2. Fix details.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    634e271 View commit details
    Browse the repository at this point in the history

  3. Improve expansion of node's bound. Do not include the overlapping buf… 

    …fer in the bounds of both nodes.
    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    8b2dc10 View commit details
    Browse the repository at this point in the history

  4. Fix simple errors.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    7aaf969 View commit details
    Browse the repository at this point in the history

  5. Add support for Hybrid SP-Tree Search (Single tree traverser).

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    8d5994c View commit details
    Browse the repository at this point in the history

  6. Add support for spill trees in knn search.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    2e67697 View commit details
    Browse the repository at this point in the history

  7. Syntax details.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    c23f0b5 View commit details
    Browse the repository at this point in the history

  8. Fix error in the order of parameters.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    91334cb View commit details
    Browse the repository at this point in the history

  9. Add tests for spill tree.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    061ee92 View commit details
    Browse the repository at this point in the history

  10. Add approximate knn search tests for hybrid spill trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    7bd4416 View commit details
    Browse the repository at this point in the history

  11. Add exact knn search tests for hybrid spill trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    946eddf View commit details
    Browse the repository at this point in the history

  12. Include missing headers.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    c9f6cd3 View commit details
    Browse the repository at this point in the history

  13. Use a simple tree traverser for spill tree (Remove defeatist seach in… 

    …cluded in single tree traverser).
    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    e33a112 View commit details
    Browse the repository at this point in the history

  14. Implement defeatist search in the Rescore() method, with a specializa… 

    …tion for Spill Trees.
    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    e1c01ca View commit details
    Browse the repository at this point in the history

  15. Remove unnecessary BoundType template parameter.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    723bec5 View commit details
    Browse the repository at this point in the history

  16. Record splitDimension and splitValue.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    2af816a View commit details
    Browse the repository at this point in the history

  17. Set Overlapping node when percentage greater than rho but not because of 

    overlapping points.
    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    5266096 View commit details
    Browse the repository at this point in the history

  18. Add NeighborSearchRules specialization for Spill Trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    a599bf8 View commit details
    Browse the repository at this point in the history

  19. Add dual tree traverser for Spill Trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    b4d5a1d View commit details
    Browse the repository at this point in the history

  20. Set non-overlapping for spill query tree.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    9551cc6 View commit details
    Browse the repository at this point in the history

  21. Avoid calculating bounds when oldScore is the best possible.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    9c1ef2a View commit details
    Browse the repository at this point in the history

  22. Remove unnecessary copying of dataset in SpillTrees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    498e74d View commit details
    Browse the repository at this point in the history

  23. Create a new class SpillSearch that encapsulates an instance of Neigh… 

    …borSearch class, and adds the functionality to deal with spill trees.
    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    e95e3b4 View commit details
    Browse the repository at this point in the history

  24. Update NSModel to use SpillSearch class.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    0120357 View commit details
    Browse the repository at this point in the history

  25. Log Num of BaseCases/Score.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    5d68382 View commit details
    Browse the repository at this point in the history

  26. Add more tests for SpillSearch

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    bff4eca View commit details
    Browse the repository at this point in the history

  27. Update documentation.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    c86b32c View commit details
    Browse the repository at this point in the history

  28. Remove B_2 bound for neighbor search with spill trees.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    ce34be6 View commit details
    Browse the repository at this point in the history

  29. Change spill rules's filename.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    ea37f0d View commit details
    Browse the repository at this point in the history

  30. Fix SpillTree's move constructor

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    f778e8e View commit details
    Browse the repository at this point in the history

  31. Include overlapping points in each child's bounding box.

    @MarcosPividori
    MarcosPividori committed Aug 1, 2016
    Copy the full SHA
    a4ac0b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2016

  1. Generalize Spill Trees, to consider general splitting hyperplanes, no… 

    …t necessarily axis-orthogonal.
    @MarcosPividori
    MarcosPividori committed Aug 4, 2016
    Copy the full SHA
    9588a6d View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary code.

    @MarcosPividori
    MarcosPividori committed Aug 4, 2016
    Copy the full SHA
    4a66098 View commit details
    Browse the repository at this point in the history

  3. Update SpillSearch to the general definition of Spill Trees.

    @MarcosPividori
    MarcosPividori committed Aug 4, 2016
    Copy the full SHA
    b9e23d4 View commit details
    Browse the repository at this point in the history

  4. Fix serialization.

    @MarcosPividori
    MarcosPividori committed Aug 4, 2016
    Copy the full SHA
    a71b57c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. Update documentation.

    @MarcosPividori
    MarcosPividori committed Aug 5, 2016
    Copy the full SHA
    54614ba View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2016

  1. Use arma::Col instead of std::vector. Also, avoid resizing in SplitPo… 

    …ints(), doing a previous calculation of the number of points to be stored.
    @MarcosPividori
    MarcosPividori committed Aug 6, 2016
    Copy the full SHA
    388941a View commit details
    Browse the repository at this point in the history

  2. Properly consider all points to the left when hyperplane was not init… 

    …ialized.
    @MarcosPividori
    MarcosPividori committed Aug 6, 2016
    Copy the full SHA
    72274e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Avoid calculating the score of both child nodes when not necessary, w… 

    …ith the Single Tree Traverser for Spill Trees.
    @MarcosPividori
    MarcosPividori committed Aug 8, 2016
    Copy the full SHA
    fdc8e9c View commit details
    Browse the repository at this point in the history

  2. Split implementation of different split methods in separated files, a… 

    …nd move all of them to a separated directory, so they can be used by other tree types.
    @MarcosPividori
    MarcosPividori committed Aug 8, 2016
    Copy the full SHA
    8f32156 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Add a new test to check the splitting of points in Spill Trees.

    @MarcosPividori
    MarcosPividori committed Aug 10, 2016
    Copy the full SHA
    02d4a6d View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Always normalise a projection vector.

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    e81731d View commit details
    Browse the repository at this point in the history

  2. Add Tests for Hyperplane class.

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    17d2c2f View commit details
    Browse the repository at this point in the history

  3. Fix file order.

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    d8b16a0 View commit details
    Browse the repository at this point in the history

  4. Add new element to TreeTraits, to know if NumDescendants() includes d… 

    …uplicated points.
    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    3b15fdf View commit details
    Browse the repository at this point in the history

  5. Add rho and leafSize members on SpillSearch, and a command line param… 

    …enter '--rho' for mlpack_knn.
    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    fa81be4 View commit details
    Browse the repository at this point in the history

  6. Add command line parameter to calculate the effective error.

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    9a8a9eb View commit details
    Browse the repository at this point in the history

  7. Shouldn't modify parameters of trained model.

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    f33a19d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into spill-trees

    @MarcosPividori
    MarcosPividori committed Aug 11, 2016
    Copy the full SHA
    d22e65a View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Properly count the number of cases when calculating the effective err… 

    …or in

approximate nearest neighbor search.
    @MarcosPividori
    MarcosPividori committed Aug 12, 2016
    Copy the full SHA
    69804c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Merge branch 'master' into spill-trees

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    180fc11 View commit details
    Browse the repository at this point in the history

  2. This should make appVeyor succeed.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    c42e40b View commit details
    Browse the repository at this point in the history

  3. Remove old include.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    7e5e054 View commit details
    Browse the repository at this point in the history

  4. Add compiler option for MSVC.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    d3ab34a View commit details
    Browse the repository at this point in the history

  5. Many syntax details.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    e06cfc8 View commit details
    Browse the repository at this point in the history

  6. Fix comment.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    722d211 View commit details
    Browse the repository at this point in the history

  7. Syntax details.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    89725f4 View commit details
    Browse the repository at this point in the history

  8. Use linspace to fill a Col vector.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    0757955 View commit details
    Browse the repository at this point in the history

  9. Simplify the code.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    dce67ec View commit details
    Browse the repository at this point in the history

  10. Add EffectiveError() to NeighborSearch class, and a proper command li… 

    …ne option to mlpack_knn and mlpack_kfn.
    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    9215515 View commit details
    Browse the repository at this point in the history

  11. Add Recall() to NeighborSearch class, and a proper command line optio… 

    …n to mlpack_knn and mlpack_kfn.
    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    3e79d27 View commit details
    Browse the repository at this point in the history

  12. Emphasize command line comments.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    99de521 View commit details
    Browse the repository at this point in the history

  13. Simple syntax detail.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    ac5f836 View commit details
    Browse the repository at this point in the history

  14. Split test in 2 tests.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    207c1d4 View commit details
    Browse the repository at this point in the history

  15. Simplify knn test.

    @MarcosPividori
    MarcosPividori committed Aug 16, 2016
    Copy the full SHA
    471bb24 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Add tests for Move and Copy constructors of SpilTrees.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    f1253d3 View commit details
    Browse the repository at this point in the history

  2. Details in spilltree and knn tests.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    f989164 View commit details
    Browse the repository at this point in the history

  3. Split line.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    02fb618 View commit details
    Browse the repository at this point in the history

  4. Properly define the Tree Traversers for Spill trees.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    0267acb View commit details
    Browse the repository at this point in the history

  5. Add a new template parameter to NeighborSearch class, to set a specif… 

    …ic SingleTreeTraverser.
    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    70fbeab View commit details
    Browse the repository at this point in the history

  6. Set defeatist traverser for spill search class.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    b334674 View commit details
    Browse the repository at this point in the history

  7. Remove specialization of NeighborSearchRules for SpillTrees.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    e4ce9be View commit details
    Browse the repository at this point in the history

  8. Avoid B_2 bound for Spill Trees.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    2bad753 View commit details
    Browse the repository at this point in the history

  9. Properly consider ElemType parameter for bounds.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    b55534d View commit details
    Browse the repository at this point in the history

  10. Improve reverse compatibility of NSModel.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    2698225 View commit details
    Browse the repository at this point in the history

  11. Avoid calculating the bounds when oldScore is the best possible.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    e4cf1fd View commit details
    Browse the repository at this point in the history

  12. Properly update search model.

    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    ecaf1bf View commit details
    Browse the repository at this point in the history

  13. Add Warning when true_neighbors_file and true_distances_file are prov… 

    …ided in exact neighbor search.
    @MarcosPividori
    MarcosPividori committed Aug 17, 2016
    Copy the full SHA
    c5fe485 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Remove SpillSearch class. Use NeighborSearch class and typedefs for d… 

    …efeatist search.
    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    5795c74 View commit details
    Browse the repository at this point in the history

  2. Update template name.

    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    ae84513 View commit details
    Browse the repository at this point in the history

  3. Update tests to consider SpillKNN.

    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    b1530ea View commit details
    Browse the repository at this point in the history

  4. Remove outdated information.

    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    da35f94 View commit details
    Browse the repository at this point in the history

  5. Doesn't copy the dataset in the copy constructor when it is not neces… 

    …sary.
    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    8a5ec21 View commit details
    Browse the repository at this point in the history

  6. Fix Copy constructor. Properly set pointer to dataset.

    @MarcosPividori
    MarcosPividori committed Aug 18, 2016
    Copy the full SHA
    815391b View commit details
    Browse the repository at this point in the history