Merge pull request #74 from probcomp/062724-emilyaf-model4

Add NoisyRelation and a Relation virtual class.
probcomp · Jul 3, 2024 · d6061f3 · d6061f3
2 parents 4fc2bad + 8c8cf9a
commit d6061f3
Show file tree

Hide file tree

Showing 23 changed files with 884 additions and 467 deletions.
diff --git a/cxx/BUILD b/cxx/BUILD
@@ -7,6 +7,20 @@ cc_library(
     deps = [],
 )
 
+cc_library(
+    name = "clean_relation",
+    hdrs = ["clean_relation.hh"],
+    visibility = [":__subpackages__"],
+    deps = [
+        ":domain",
+        ":relation",
+        ":util_distribution_variant",
+        ":util_hash",
+        ":util_math",
+        "//distributions:base"
+    ],
+)
+
 cc_library(
     name = "domain",
     hdrs = ["domain.hh"],
@@ -21,7 +35,7 @@ cc_library(
     srcs = ["irm.cc"],
     visibility = [":__subpackages__"],
     deps = [
-        ":relation",
+        ":clean_relation",
         ":relation_variant",
         ":util_distribution_variant",
     ],
@@ -60,6 +74,21 @@ cc_binary(
     ],
 )
 
+cc_library(
+    name = "noisy_relation",
+    hdrs = ["noisy_relation.hh"],
+    visibility = [":__subpackages__"],
+    deps = [
+        ":domain",
+        ":clean_relation",
+        ":relation",
+        ":util_distribution_variant",
+        ":util_hash",
+        ":util_math",
+        "//distributions:base"
+    ],
+)
+
 cc_library(
     name = "relation",
     hdrs = ["relation.hh"],
@@ -80,6 +109,7 @@ cc_library(
     visibility = [":__subpackages__"],
     deps = [
         ":domain",
+        ":clean_relation",
         ":relation",
         ":util_distribution_variant",
     ],
@@ -94,6 +124,7 @@ cc_library(
         ":domain",
         "//distributions",
         "@boost//:algorithm",
+        "//emissions",
     ],
 )
 
@@ -125,6 +156,17 @@ cc_library(
     deps = [],
 )
 
+cc_test(
+    name = "clean_relation_test",
+    srcs = ["clean_relation_test.cc"],
+    deps = [
+        ":domain",
+        ":clean_relation",
+        "//distributions",
+        "@boost//:test",
+    ],
+)
+
 cc_test(
     name = "domain_test",
     srcs = ["domain_test.cc"],
@@ -144,11 +186,12 @@ cc_test(
 )
 
 cc_test(
-    name = "relation_test",
-    srcs = ["relation_test.cc"],
+    name = "noisy_relation_test",
+    srcs = ["noisy_relation_test.cc"],
     deps = [
         ":domain",
-        ":relation",
+        ":clean_relation",
+        ":noisy_relation",
         "//distributions",
         "@boost//:test",
     ],
@@ -158,6 +201,7 @@ cc_test(
     name = "relation_variant_test",
     srcs = ["relation_variant_test.cc"],
     deps = [
+        ":clean_relation",
         ":relation_variant",
         "@boost//:test",
     ],