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

Add Unincorporate to Domain/Clean Relation #83

Merged
merged 3 commits into from
Jul 11, 2024
Merged

Add Unincorporate to Domain/Clean Relation #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6524be
Add unincorporate for clean_relation and domain
srvasude Jul 11, 2024
1751fb1
Update irm_test to check unincorporate
srvasude Jul 11, 2024
57d10d9
Add noisy_relation testing
srvasude Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions cxx/clean_relation.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,27 @@ class CleanRelation : public Relation<T> {
}

void unincorporate(const T_items& items) {
printf("Not implemented\n");
exit(EXIT_FAILURE);
// auto x = data.at(items);
// auto z = get_cluster_assignment(items);
// clusters.at(z)->unincorporate(x);
// if (clusters.at(z)->N == 0) {
// delete clusters.at(z);
// clusters.erase(z);
// }
// for (int i = 0; i < domains.size(); i++) {
// const std::string &n = domains[i]->name;
// if (data_r.at(n).count(items[i]) > 0) {
// data_r.at(n).at(items[i]).erase(items);
// if (data_r.at(n).at(items[i]).size() == 0) {
// data_r.at(n).erase(items[i]);
// domains[i]->unincorporate(name, items[i]);
// }
// }
// }
// data.erase(items);
assert(data.contains(items));
ValueType value = data.at(items);
std::vector<int> z = get_cluster_assignment(items);
clusters.at(z)->unincorporate(value);
if (clusters.at(z)->N == 0) {
delete clusters.at(z);
clusters.erase(z);
}
for (int i = 0; i < std::ssize(domains); ++i) {
const std::string& name = domains[i]->name;
if (data_r.at(name).contains(items[i])) {
data_r.at(name).at(items[i]).erase(items);
if (data_r.at(name).at(items[i]).size() == 0) {
// It's safe to unincorporate this element since no other data point
// refers to it.
data_r.at(name).erase(items[i]);
domains[i]->unincorporate(items[i]);
}
}
}
data.erase(items);
}

std::vector<int> get_cluster_assignment(const T_items& items) const {
Expand Down
42 changes: 39 additions & 3 deletions cxx/clean_relation_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,56 @@ BOOST_AUTO_TEST_CASE(test_clean_relation) {
BOOST_TEST(db->N == 0);
db->incorporate(false);
BOOST_TEST(db->N == 1);
}

BOOST_AUTO_TEST_CASE(test_string_relation) {
std::mt19937 prng;
Domain D1("D1");
Domain D2("D2");

DistributionSpec bigram_spec = DistributionSpec("bigram");
CleanRelation<std::string> R2("R1", bigram_spec, {&D2, &D3});
CleanRelation<std::string> R2("R2", bigram_spec, {&D1, &D2});
R2.incorporate(&prng, {1, 3}, "cat");
R2.incorporate(&prng, {1, 2}, "dog");
R2.incorporate(&prng, {1, 4}, "catt");
R2.incorporate(&prng, {2, 6}, "fish");

double lpg __attribute__((unused));
lpg = R2.logp_gibbs_approx(D2, 2, 0, &prng);
R2.set_cluster_assignment_gibbs(D3, 3, 1, &prng);
D1.set_cluster_assignment_gibbs(0, 1);
R2.set_cluster_assignment_gibbs(D2, 3, 1, &prng);
D1.set_cluster_assignment_gibbs(1, 1);

Distribution<std::string>* db2 = R2.make_new_distribution(&prng);
BOOST_TEST(db2->N == 0);
db2->incorporate("hello");
BOOST_TEST(db2->N == 1);
}

BOOST_AUTO_TEST_CASE(test_unincorporate) {
srvasude marked this conversation as resolved.
Show resolved Hide resolved
std::mt19937 prng;
Domain D1("D1");
Domain D2("D2");
DistributionSpec spec = DistributionSpec("bernoulli");
CleanRelation<bool> R1("R1", spec, {&D1, &D2});
R1.incorporate(&prng, {0, 1}, 1);
R1.incorporate(&prng, {0, 2}, 1);
R1.incorporate(&prng, {3, 0}, 1);
R1.incorporate(&prng, {3, 1}, 1);

R1.unincorporate({3, 1});
BOOST_TEST(R1.data.size() == 3);
// Expect that these are still in the domain since the data points {3, 0} and
// {0, 1} refer to them.
BOOST_TEST(D1.items.contains(3));
BOOST_TEST(D2.items.contains(1));

R1.unincorporate({0, 2});
BOOST_TEST(R1.data.size() == 2);
BOOST_TEST(D1.items.contains(0));
BOOST_TEST(!D2.items.contains(2));

R1.unincorporate({0, 1});
BOOST_TEST(R1.data.size() == 1);
BOOST_TEST(!D1.items.contains(0));
BOOST_TEST(!D2.items.contains(1));
}
12 changes: 3 additions & 9 deletions cxx/domain.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,9 @@ class Domain {
}
}
void unincorporate(const T_item& item) {
printf("Not implemented\n");
exit(EXIT_FAILURE);
// assert(items.count(item) == 1);
// assert(items.at(item).count(relation) == 1);
// items.at(item).erase(relation);
// if (items.at(item).size() == 0) {
// crp.unincorporate(item);
// items.erase(item);
// }
assert(items.count(item) == 1);
crp.unincorporate(item);
items.erase(item);
}
int get_cluster_assignment(const T_item& item) const {
assert(items.contains(item));
Expand Down
5 changes: 5 additions & 0 deletions cxx/domain_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ BOOST_AUTO_TEST_CASE(test_domain) {
int ca = d.get_cluster_assignment(apple);
BOOST_TEST(ca == 5);
BOOST_TEST(cb == 12);

d.unincorporate(banana);
BOOST_TEST(!d.items.contains(banana));
BOOST_TEST(d.items.contains(apple));
BOOST_TEST(d.items.size() == 1);
}
6 changes: 2 additions & 4 deletions cxx/irm_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ BOOST_AUTO_TEST_CASE(test_irm) {
irm.transition_cluster_assignments_all(&prng);
BOOST_TEST(irm.logp_score() == one_obs_score);

// TODO(thomaswc): Uncomment below when relation::unincorporate is
// implemented.
// irm.unincorporate("R1", {1, 2});
// BOOST_TEST(irm.logp_score() == 0.0);
irm.unincorporate("R1", {1, 2});
BOOST_TEST(irm.logp_score() == 0.0);

irm.incorporate(&prng, "R2", {0, 3}, 1.);
irm.incorporate(&prng, "R4", {0, 3, 1}, 1.2);
Expand Down
2 changes: 2 additions & 0 deletions cxx/noisy_relation.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ class NoisyRelation : public Relation<T> {
}

void unincorporate(const T_items& items) {
assert(data.contains(items));
emission_relation.unincorporate(items);
data.erase(items);
}

double logp_gibbs_approx(const Domain& domain, const T_item& item, int table,
Expand Down
38 changes: 38 additions & 0 deletions cxx/noisy_relation_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,41 @@ BOOST_AUTO_TEST_CASE(test_noisy_relation) {
NR2.set_cluster_assignment_gibbs(D3, 3, 1, &prng);
D1.set_cluster_assignment_gibbs(0, 1);
}

BOOST_AUTO_TEST_CASE(test_unincorporate) {
std::mt19937 prng;
Domain D1("D1");
Domain D2("D2");
DistributionSpec spec = DistributionSpec("bernoulli");
CleanRelation<bool> R1("R1", spec, {&D1, &D2});
R1.incorporate(&prng, {0, 1}, 1);
R1.incorporate(&prng, {0, 2}, 1);
R1.incorporate(&prng, {3, 0}, 1);
R1.incorporate(&prng, {3, 1}, 1);

EmissionSpec em_spec = EmissionSpec("sometimes_bitflip");
NoisyRelation<bool> NR1("NR1", em_spec, {&D1, &D2}, &R1);

NR1.incorporate(&prng, {0, 1}, 0);
NR1.incorporate(&prng, {0, 2}, 1);
NR1.incorporate(&prng, {3, 0}, 0);
NR1.incorporate(&prng, {3, 1}, 1);

NR1.unincorporate({3, 1});
BOOST_TEST(NR1.data.size() == 3);
BOOST_TEST(NR1.data.size() == 3);
// Expect that these are still in the domain since the data points {3, 0} and
// {0, 1} refer to them.
BOOST_TEST(D1.items.contains(3));
BOOST_TEST(D2.items.contains(1));

NR1.unincorporate({0, 2});
BOOST_TEST(NR1.data.size() == 2);
BOOST_TEST(D1.items.contains(0));
BOOST_TEST(!D2.items.contains(2));

NR1.unincorporate({0, 1});
BOOST_TEST(NR1.data.size() == 1);
BOOST_TEST(!D1.items.contains(0));
BOOST_TEST(!D2.items.contains(1));
}