Skip to content

Commit

Permalink
Drop EmbeddingConverter::embed
Browse files Browse the repository at this point in the history
  • Loading branch information
vinx13 authored and vigsterkr committed Jul 10, 2018
1 parent 6d183fe commit e70a435
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
5 changes: 0 additions & 5 deletions src/shogun/converter/EmbeddingConverter.cpp
Expand Up @@ -29,11 +29,6 @@ CEmbeddingConverter::~CEmbeddingConverter()
SG_UNREF(m_kernel);
}

CDenseFeatures<float64_t>* CEmbeddingConverter::embed(CFeatures* features)
{
return (CDenseFeatures<float64_t>*)transform(features);
}

void CEmbeddingConverter::set_target_dim(int32_t dim)
{
ASSERT(dim>0)
Expand Down
9 changes: 1 addition & 8 deletions src/shogun/converter/EmbeddingConverter.h
Expand Up @@ -39,17 +39,10 @@ class CEmbeddingConverter: public CConverter
/** Apply transformation to features. In-place mode is not supported for
* Tapkee converters.
* @param features features to embed
* @return embedding features
* @return embedding dense real features
*/
virtual CFeatures* transform(CFeatures* features, bool inplace = true) = 0;

/** embed given features, acts the same as apply, but returns
* DenseFeatures
* @param features features to embed
* @return embedding simple features
*/
virtual CDenseFeatures<float64_t>* embed(CFeatures* features);

/** setter for target dimension
* @param dim target dimension
*/
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/converter/Isomap_unittest.cc
Expand Up @@ -118,8 +118,9 @@ TEST(DISABLED_IsomapTest,neighbors_preserving)
isoEmbedder->set_target_dim(n_target_dimensions);
EXPECT_EQ(n_target_dimensions, isoEmbedder->get_target_dim());

CDenseFeatures<float64_t>* low_dimensional_features =
isoEmbedder->embed(high_dimensional_features);
auto low_dimensional_features =
isoEmbedder->transform(high_dimensional_features)
->as<CDenseFeatures<float64_t>>();

EXPECT_EQ(n_target_dimensions,low_dimensional_features->get_dim_feature_space());
EXPECT_EQ(high_dimensional_features->get_num_vectors(),low_dimensional_features->get_num_vectors());
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/converter/ManifoldSculpting_unittest.cc
Expand Up @@ -23,8 +23,9 @@ TEST(ManifoldSculptingTest,DISABLED_basic)

embedder->set_k(5);

CDenseFeatures<float64_t>* low_dimensional_features =
embedder->embed(high_dimensional_features);
auto low_dimensional_features =
embedder->transform(high_dimensional_features)
->as<CDenseFeatures<float64_t>>();

EXPECT_EQ(n_target_dimensions,low_dimensional_features->get_dim_feature_space());
EXPECT_EQ(high_dimensional_features->get_num_vectors(),low_dimensional_features->get_num_vectors());
Expand Down
Expand Up @@ -26,8 +26,9 @@ TEST(TDistributedStochasticNeighborEmbeddingTest,basic)
*/
embedder->set_perplexity(n_samples / 5.0);

CDenseFeatures<float64_t>* low_dimensional_features =
embedder->embed(high_dimensional_features);
auto low_dimensional_features =
embedder->transform(high_dimensional_features)
->as<CDenseFeatures<float64_t>>();

EXPECT_EQ(n_target_dimensions,low_dimensional_features->get_dim_feature_space());
EXPECT_EQ(high_dimensional_features->get_num_vectors(),low_dimensional_features->get_num_vectors());
Expand Down

0 comments on commit e70a435

Please sign in to comment.