Skip to content

Commit

Permalink
Replace old clone tests with systematic new one (#4150)
Browse files Browse the repository at this point in the history
  • Loading branch information
@karlnapf
karlnapf committed Feb 5, 2018
1 parent f3ad96b commit acb321d
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 66 deletions.
27 changes: 22 additions & 5 deletions tests/unit/base/MockObject.h
View file
Expand Up @@ -23,6 +23,7 @@ namespace shogun
m_some_value = 1;

watch_param("some_value", &m_some_value);
m_parameters->add(&m_some_value, "some_value", "Some value");
}
const char* get_name() const override
{
Expand All @@ -38,9 +39,8 @@ namespace shogun

virtual CSGObject* clone() override
{
auto* clone = new CCloneEqualsMockParameter<T>();
clone->m_was_cloned = true;
SG_REF(clone);
auto* clone = CSGObject::clone();
((CCloneEqualsMockParameter*)clone)->m_was_cloned = true;
return clone;
}

Expand Down Expand Up @@ -75,11 +75,10 @@ namespace shogun
{
m_basic = 1;
watch_param("basic", &m_basic);
m_parameters->add(&m_basic, "basic", "The basic guy");

m_object = new CCloneEqualsMockParameter<T>();
watch_param("object", &m_object);

// TODO: delete once clone is based on tags
m_parameters->add(
(CSGObject**)&m_object, "object", "The object (tm)");
}
Expand All @@ -94,10 +93,12 @@ namespace shogun
m_sg_vector = SGVector<T>(2);
m_sg_vector.set_const(m_basic);
watch_param("sg_vector", &m_sg_vector);
m_parameters->add(&m_sg_vector, "sg_vector", "The SGVector");

m_sg_matrix = SGMatrix<T>(3, 4);
m_sg_matrix.set_const(m_basic);
watch_param("sg_matrix", &m_sg_matrix);
m_parameters->add(&m_sg_matrix, "sg_matrix", "The SGMatrix");
}

void init_sg_sparse_vector_matrix()
Expand All @@ -111,6 +112,8 @@ namespace shogun
m_sg_sparse_vector.features[i] = entry;
}
watch_param("sg_sparse_vector", &m_sg_sparse_vector);
m_parameters->add(
&m_sg_sparse_vector, "sg_sparse_vector", "The SGSparseVector");

m_sg_sparse_matrix =
SGSparseMatrix<T>(m_sg_sparse_vector.num_feat_entries, 6);
Expand All @@ -127,6 +130,8 @@ namespace shogun
m_sg_sparse_matrix.sparse_matrix[i] = vec;
}
watch_param("sg_sparse_matrix", &m_sg_sparse_matrix);
m_parameters->add(
&m_sg_sparse_matrix, "sg_sparse_matrix", "The SGSparseMatrix");
}

void init_raw_vector()
Expand All @@ -138,6 +143,9 @@ namespace shogun
watch_param(
"raw_vector_basic", &m_raw_vector_basic,
&m_raw_vector_basic_len);
m_parameters->add_vector(
&m_raw_vector_basic, &m_raw_vector_basic_len,
"raw_vector_basic", "The raw vector basic");

m_raw_vector_sg_string_len = 7;
m_raw_vector_sg_string =
Expand All @@ -151,6 +159,9 @@ namespace shogun
watch_param(
"raw_vector_sg_string", &m_raw_vector_sg_string,
&m_raw_vector_sg_string_len);
m_parameters->add_vector(
&m_raw_vector_sg_string, &m_raw_vector_sg_string_len,
"raw_vector_sg_string", "The raw vector sg_string");

m_raw_vector_object_len = 6;
m_raw_vector_object =
Expand All @@ -160,6 +171,9 @@ namespace shogun
watch_param(
"raw_vector_object", &m_raw_vector_object,
&m_raw_vector_object_len);
m_parameters->add_vector(
(CSGObject***)&m_raw_vector_object, &m_raw_vector_object_len,
"raw_vector_object", "The raw vector object");
}

void free_raw_vector()
Expand Down Expand Up @@ -187,6 +201,9 @@ namespace shogun
watch_param(
"raw_matrix_basic", &m_raw_matrix_basic,
&m_raw_matrix_basic_rows, &m_raw_matrix_basic_cols);
m_parameters->add_matrix(
&m_raw_matrix_basic, &m_raw_matrix_basic_rows,
&m_raw_matrix_basic_cols, "raw_matrix_basic", "The raw matrix");
}

void free_raw_matrix()
Expand Down
86 changes: 25 additions & 61 deletions tests/unit/base/SGObject_unittest.cc
View file
Expand Up @@ -189,91 +189,55 @@ TEST(SGObjectEquals, different_type)
EXPECT_FALSE(obj2->equals(obj1));
}

TYPED_TEST(SGObjectClone, basic)
TYPED_TEST(SGObjectClone, basic_checks)
{
auto obj = some<CCloneEqualsMock<TypeParam>>();

CSGObject* clone = nullptr;
try
{
clone = obj->clone();
}
catch (...)
{
}
CSGObject* clone = obj->clone();

EXPECT_NE(clone, obj);
ASSERT_NE(clone, nullptr);
EXPECT_EQ(clone->ref_count(), 1);

auto clone_casted = dynamic_cast<CCloneEqualsMock<TypeParam>*>(clone);
ASSERT_NE(clone_casted, nullptr);
ASSERT_NE(clone_casted->m_object, obj->m_object);

EXPECT_NE(clone_casted->m_object, obj->m_object);
EXPECT_EQ(clone_casted->m_object->m_was_cloned, true);

EXPECT_EQ(std::string(clone->get_name()), std::string(obj->get_name()));

SG_UNREF(clone);
}

TEST(SGObject, clone_basic_parameter)
{
auto object = some<CGaussianKernel>();
object->put("log_width", 2.0);
ASSERT_EQ(object->get<float64_t>("log_width"), 2);

auto clone = object->clone();
EXPECT_EQ(
object->get<float64_t>("log_width"),
clone->get<float64_t>("log_width"));
}

TEST(SGObject, clone_sgmatrix_parameter)
TYPED_TEST(SGObjectClone, equals_empty)
{
SGMatrix<float64_t> data(10, 10);
for (auto i : range(data.num_rows * data.num_cols))
data.matrix[i] = CMath::randn_double();
auto obj = some<CCloneEqualsMock<TypeParam>>();

auto object = some<CDenseFeatures<float64_t>>(data);
ASSERT_TRUE(data.equals(object->get_feature_matrix()));
CSGObject* clone = obj->clone();
EXPECT_TRUE(clone->equals(obj));

auto clone = object->clone();
EXPECT_NE(
data.data(), clone->get<SGMatrix<float64_t>>("feature_matrix").data());
ASSERT_TRUE(data.equals(clone->get<SGMatrix<float64_t>>("feature_matrix")));
SG_UNREF(clone);
}

TEST(SGObject, clone_sgvector_parameter)
TYPED_TEST(SGObjectClone, equals_non_empty)
{
SGVector<float64_t> data(10);
for (auto i : range(data.vlen))
data.vector[i] = CMath::randn_double();

auto object = some<CRegressionLabels>(data);
ASSERT_TRUE(data.equals(object->get_labels()));

auto clone = object->clone();
EXPECT_NE(data.data(), clone->get<SGVector<float64_t>>("labels").data());
EXPECT_TRUE(data.equals(clone->get<SGVector<float64_t>>("labels")));
}
auto obj = some<CCloneEqualsMock<TypeParam>>();
obj->m_basic -= 1;
obj->m_object->m_some_value -= 1;
obj->m_sg_vector[0] -= 1;
obj->m_sg_matrix(0, 0) = 0;
obj->m_sg_sparse_vector.features[0].entry -= 1;
obj->m_sg_sparse_matrix.sparse_matrix[0].features[0].entry -= 1;
obj->m_raw_vector_basic[0] -= 1;
obj->m_raw_matrix_basic[0] -= 1;
obj->m_raw_vector_sg_string[0].string[0] -= 1;
obj->m_raw_vector_object[0]->m_some_value -= 1;

CSGObject* clone = obj->clone();
EXPECT_TRUE(clone->equals(obj));

TEST(SGObject, clone_sgobject_parameter)
{
SGMatrix<float64_t> data(10, 10);
for (auto i : range(data.num_rows * data.num_cols))
data.matrix[i] = CMath::randn_double();

auto object_parameter = some<CDenseFeatures<float64_t>>(data);
auto object = some<CGaussianKernel>();
object->init(object_parameter, object_parameter);
ASSERT_TRUE(object_parameter->equals(object->get<CSGObject*>("lhs")));
ASSERT_TRUE(object_parameter->equals(object->get<CSGObject*>("rhs")));

auto clone = object->clone();
EXPECT_NE(object_parameter, clone->get<CSGObject*>("lhs"));
EXPECT_NE(object_parameter, clone->get<CSGObject*>("rhs"));
EXPECT_TRUE(object_parameter->equals(clone->get<CSGObject*>("lhs")));
EXPECT_TRUE(object_parameter->equals(clone->get<CSGObject*>("rhs")));
SG_UNREF(clone);
}

TEST(SGObject,DISABLED_ref_copy_constructor)
Expand Down

0 comments on commit acb321d

Please sign in to comment.