Clang and warnings fixes

include/tapkee/defines/methods.hpp

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <tapkee/defines/types.hpp>
+#include <tapkee/traits/methods_traits.hpp>
 
 namespace tapkee
 {
@@ -103,11 +104,6 @@ template <typename M> struct Method
     Method(const M& m) : name_(m.name_)
     {
     }
-    Method& operator=(const Method& m)
-    {
-        this->name_ = m.name_;
-        return *this;
-    }
     const char* name() const
     {
         return name_;

include/tapkee/defines/types.hpp

@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <tapkee/defines/eigen3.hpp>
+
 namespace tapkee
 {
 #ifdef TAPKEE_CUSTOM_INTERNAL_NUMTYPE

include/tapkee/external/barnes_hut_sne/quadtree.hpp

@@ -299,52 +299,6 @@ class QuadTree
             return true;
     }
 
-    // Rebuilds a possibly incorrect tree (LAURENS: This function is not tested yet!)
-    void rebuildTree()
-    {
-        for (int n = 0; n < size; n++)
-        {
-            // Check whether point is erroneous
-            ScalarType* point = data + index[n] * QT_NO_DIMS;
-            if (!boundary.containsPoint(point))
-            {
-
-                // Remove erroneous point
-                int rem_index = index[n];
-                for (int m = n + 1; m < size; m++)
-                    index[m - 1] = index[m];
-                index[size - 1] = -1;
-                size--;
-
-                // Update center-of-mass and counter in all parents
-                bool done = false;
-                QuadTree* node = this;
-                while (!done)
-                {
-                    for (int d = 0; d < QT_NO_DIMS; d++)
-                    {
-                        node->center_of_mass[d] = ((ScalarType)node->cum_size * node->center_of_mass[d] - point[d]) /
-                                                  (ScalarType)(node->cum_size - 1);
-                    }
-                    node->cum_size--;
-                    if (node->getParent() == NULL)
-                        done = true;
-                    else
-                        node = node->getParent();
-                }
-
-                // Reinsert point in the root tree
-                node->insert(rem_index);
-            }
-        }
-
-        // Rebuild lower parts of the tree
-        northWest->rebuildTree();
-        northEast->rebuildTree();
-        southWest->rebuildTree();
-        southEast->rebuildTree();
-    }
-
     // Build a list of all indices in quadtree
     void getAllIndices(int* indices)
     {

include/tapkee/projection.hpp

@@ -4,6 +4,8 @@
  */
 #pragma once
 
+#include <tapkee/defines/types.hpp>
+
 #include <memory>
 
 namespace tapkee

include/tapkee/utils/naming.hpp

@@ -4,6 +4,10 @@
  */
 #pragma once
 
+#include <tapkee/defines/methods.hpp>
+
+#include <string>
+
 namespace tapkee
 {
 

test/unit/interface.cpp

@@ -144,15 +144,15 @@ TEST(Interface, ParametersSet)
 {
     int td = 3;
     int k = 5;
-    tapkee::ParametersSet pg = tapkee::kwargs[target_dimension = td, num_neighbors = k];
+    tapkee::ParametersSet pg = tapkee::kwargs[(target_dimension = td, num_neighbors = k)];
     ASSERT_EQ(static_cast<int>(pg[target_dimension]), td);
     ASSERT_EQ(static_cast<int>(pg[num_neighbors]), k);
 }
 
 TEST(Interface, OneParameterParametersSet)
 {
     int td = 3;
-    tapkee::ParametersSet pg = tapkee::kwargs[target_dimension = td];
+    tapkee::ParametersSet pg = tapkee::kwargs[(target_dimension = td)];
     ASSERT_EQ(static_cast<int>(pg[target_dimension]), td);
 }
 
@@ -168,7 +168,7 @@ TEST(Interface, WrongParameterValueKernelLocallyLinearEmbedding)
     TapkeeOutput output;
     // fails with wrong parameter type as '-1' is not a valid value.
     ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb,
-                                tapkee::kwargs[method = KernelLocallyLinearEmbedding, num_neighbors = -3]),
+                                tapkee::kwargs[(method = KernelLocallyLinearEmbedding, num_neighbors = -3)]),
                  wrong_parameter_error);
 }
 
@@ -206,7 +206,7 @@ TEST(Interface, CancellationPassThru)
     TapkeeOutput output;
     // should cancel
     ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb,
-                                tapkee::kwargs[method = PassThru, cancel_function = always_cancel]),
+                                tapkee::kwargs[(method = PassThru, cancel_function = always_cancel)]),
                  cancelled_exception);
 }
 
@@ -220,7 +220,7 @@ TEST(Interface, NoReductionMethodSetFailPassThru)
 
     TapkeeOutput output;
     // should fail with missed parameter
-    ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb, tapkee::kwargs[eigen_method = Dense]),
+    ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb, tapkee::kwargs[(eigen_method = Dense)]),
                  missed_parameter_error);
 }
 
@@ -236,7 +236,7 @@ TEST(Interface, UnsupportedRandomizedForGeneralizedLE)
 
     TapkeeOutput output;
     ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb,
-                                tapkee::kwargs[method = LaplacianEigenmaps, eigen_method = Randomized]),
+                                tapkee::kwargs[(method = LaplacianEigenmaps, eigen_method = Randomized)]),
                  unsupported_method_error);
 }
 
@@ -253,7 +253,7 @@ TEST(Interface, EigenDecompositionFailMDS)
 
     TapkeeOutput output;
     ASSERT_THROW(output = tapkee::embed(data.begin(), data.end(), kcb, dcb, fcb,
-                                        tapkee::kwargs[method = MultidimensionalScaling, eigen_method = Randomized]),
+                                        tapkee::kwargs[(method = MultidimensionalScaling, eigen_method = Randomized)]),
                  eigendecomposition_error);
 }
 
@@ -271,6 +271,6 @@ TEST(Interface, NotEnoughMemoryMDS)
     tapkee::TapkeeOutput output;
     // tries to form 10000000 x 10000000 matrix (won't work on any machine in 2013)
     ASSERT_THROW(output = embed(data.begin(), data.end(), kcb, dcb, fcb,
-                                tapkee::kwargs[method = MultidimensionalScaling, eigen_method = Dense]),
+                                tapkee::kwargs[(method = MultidimensionalScaling, eigen_method = Dense)]),
                  not_enough_memory_error);
 }