Clear memoized values after updating messages

rgmining · Jan 17, 2023 · 9bc5cd5 · 9bc5cd5
1 parent abf9d1c
commit 9bc5cd5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 35 deletions.
diff --git a/fraud_eagle/graph.py b/fraud_eagle/graph.py
@@ -19,12 +19,12 @@
 #  along with rgmining-fraud-eagle. If not, see <http://www.gnu.org/licenses/>.
 """Provide a bipartite graph class implementing Fraud Eagle algorithm.
 """
+from functools import lru_cache
 from logging import getLogger
 from typing import Any, Final, Optional, cast
 
 import networkx as nx
 import numpy as np
-from common import memoized
 
 from fraud_eagle.labels import ProductLabel, ReviewLabel, UserLabel
 from fraud_eagle.likelihood import psi
@@ -328,7 +328,7 @@ def add_review(self, reviewer: Reviewer, product: Product, rating: float, *_args
         self.graph.add_edge(reviewer, product, review=review)
         return review
 
-    @memoized
+    @lru_cache
     def retrieve_reviewers(self, product: Product) -> list[Reviewer]:
         """Retrieve reviewers review a given product.
 
@@ -340,7 +340,7 @@ def retrieve_reviewers(self, product: Product) -> list[Reviewer]:
         """
         return list(self.graph.predecessors(product))
 
-    @memoized
+    @lru_cache
     def retrieve_products(self, reviewer: Reviewer) -> list[Product]:
         """Retrieve products a given reviewer reviews.
 
@@ -352,7 +352,7 @@ def retrieve_products(self, reviewer: Reviewer) -> list[Product]:
         """
         return list(self.graph.successors(reviewer))
 
-    @memoized
+    @lru_cache
     def retrieve_review(self, reviewer: Reviewer, product: Product) -> Review:
         """Retrieve a review a given reviewer posts to a given product.
 
@@ -450,6 +450,10 @@ def update(self) -> float:
             + "\n".join("  {0}-{1}: {2}".format(edges[i], edges[i + 1], v) for i, v in enumerate(histo))
         )
 
+        # Clear memoized values since messages are updated.
+        self.prod_message_from_all_users.cache_clear()
+        self.prod_message_from_all_products.cache_clear()
+
         return max(diffs)
 
     def _update_user_to_product(self, reviewer: Reviewer, product: Product, p_label: ProductLabel) -> float:
@@ -530,7 +534,7 @@ def _update_product_to_user(self, reviewer: Reviewer, product: Product, u_label:
             )
         return _logaddexp(*res.values())
 
-    @memoized
+    @lru_cache
     def prod_message_from_all_users(self, product: Product, p_label: ProductLabel) -> float:
         """Compute a product of messages to a product.
 
@@ -581,13 +585,13 @@ def prod_message_from_users(self, reviewer: Optional[Reviewer], product: Product
         Returns:
           a logarithm of the product defined above.
         """
-        sum_all: float = self.prod_message_from_all_users(product, p_label)
+        sum_all = self.prod_message_from_all_users(product, p_label)
         sum_reviewer = 0.0
         if reviewer is not None:
             sum_reviewer = self.retrieve_review(reviewer, product).user_to_product(p_label)
         return sum_all - sum_reviewer
 
-    @memoized
+    @lru_cache
     def prod_message_from_all_products(self, reviewer: Reviewer, u_label: UserLabel) -> float:
         """Compute a product of messages sending to a reviewer.
 
@@ -638,7 +642,7 @@ def prod_message_from_products(self, reviewer: Reviewer, product: Optional[Produ
         Returns:
           a logarithm of the product defined above.
         """
-        sum_all: float = self.prod_message_from_all_products(reviewer, u_label)
+        sum_all = self.prod_message_from_all_products(reviewer, u_label)
         sum_product = 0.0
         if product is not None:
             sum_product = self.retrieve_review(reviewer, product).product_to_user(u_label)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,7 +30,6 @@ include = ["COPYING"]
 python = "^3.9"
 numpy = "^1.24.1"
 networkx = "^3.0"
-rgmining-common = "^0.9.1"
 
 [tool.poetry.group.dev.dependencies]
 bump2version = "^1.0.1"
@@ -57,10 +56,6 @@ disallow_untyped_defs = true
 module = "networkx"
 ignore_missing_imports = true
 
-[[tool.mypy.overrides]]
-module = "common"
-ignore_missing_imports = true
-
 [tool.black]
 target-version = ['py39']
 line-length = 120

diff --git a/tests/graph/test_graph.py b/tests/graph/test_graph.py
@@ -103,14 +103,16 @@ def test_prod_message_from_users_update(review_graph: ReviewGraph) -> None:
 
     assert_almost_equal(
         review_graph.prod_message_from_users(reviewers[0], products[0], ProductLabel.GOOD),
-        sum(r.user_to_product(ProductLabel.GOOD) for r in reviews[1:]))
+        sum(r.user_to_product(ProductLabel.GOOD) for r in reviews[1:]),
+    )
 
     for _ in range(10):
         review_graph.update()
 
     assert_almost_equal(
         review_graph.prod_message_from_users(reviewers[0], products[0], ProductLabel.GOOD),
-        sum(r.user_to_product(ProductLabel.GOOD) for r in reviews[1:]))
+        sum(r.user_to_product(ProductLabel.GOOD) for r in reviews[1:]),
+    )
 
 
 def test_prod_message_from_products(review_graph: ReviewGraph) -> None:
@@ -183,14 +185,16 @@ def test_prod_message_from_products_update(review_graph: ReviewGraph) -> None:
 
     assert_almost_equal(
         review_graph.prod_message_from_products(reviewers[0], products[0], UserLabel.HONEST),
-        sum(r.product_to_user(UserLabel.HONEST) for r in reviews[1:]))
+        sum(r.product_to_user(UserLabel.HONEST) for r in reviews[1:]),
+    )
 
     for _ in range(10):
         review_graph.update()
 
     assert_almost_equal(
         review_graph.prod_message_from_products(reviewers[0], products[0], UserLabel.HONEST),
-        sum(r.product_to_user(UserLabel.HONEST) for r in reviews[1:]))
+        sum(r.product_to_user(UserLabel.HONEST) for r in reviews[1:]),
+    )
 
 
 def test_update_user_to_product(review_graph: ReviewGraph) -> None: