keep build_utility_matrix in informativity

CLMBRs · Jan 10, 2024 · ef35355 · ef35355
1 parent 1a4359a
commit ef35355
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/ultk/effcomm/agent.py b/src/ultk/effcomm/agent.py
@@ -5,7 +5,6 @@
 from scipy.special import softmax
 from ultk.language.language import Expression, Language
 from ultk.language.semantics import Referent
-from ultk.effcomm.util import bayes
 
 ##############################################################################
 # Base communicative agent class

diff --git a/src/ultk/effcomm/informativity.py b/src/ultk/effcomm/informativity.py
@@ -4,7 +4,7 @@
 from cmath import isclose
 from typing import Callable
 from ultk.language.language import Language
-from ultk.language.semantics import Referent
+from ultk.language.semantics import Referent, Universe
 from ultk.effcomm.agent import (
     Speaker,
     Listener,
@@ -13,7 +13,18 @@
     PragmaticSpeaker,
     PragmaticListener,
 )
-from ultk.effcomm.util import build_utility_matrix
+
+
+def build_utility_matrix(
+    universe: Universe, utility: Callable[[Referent, Referent], float]
+) -> np.ndarray:
+    """Construct the square matrix specifying the utility function defined for pairs of meanings, used for computing communicative success."""
+    return np.array(
+        [
+            [utility(ref, ref_) for ref_ in universe.referents]
+            for ref in universe.referents
+        ]
+    )
 
 
 def indicator_utility(ref1: Referent, ref2: Referent) -> float: