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

The Witness: Remove all instances of lru_cache #3446

Merged
merged 1 commit into from
Jun 6, 2024
Merged

The Witness: Remove all instances of lru_cache #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions worlds/witness/data/static_logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from collections import defaultdict
from functools import lru_cache
from typing import Dict, List, Set, Tuple

from Utils import cache_argsless

from .item_definition_classes import (
CATEGORY_NAME_MAPPINGS,
DoorItemDefinition,
Expand Down Expand Up @@ -260,17 +261,17 @@ def get_parent_progressive_item(item_name: str) -> str:
return _progressive_lookup.get(item_name, item_name)


@lru_cache
@cache_argsless
def get_vanilla() -> StaticWitnessLogicObj:
return StaticWitnessLogicObj(get_vanilla_logic())


@lru_cache
@cache_argsless
def get_sigma_normal() -> StaticWitnessLogicObj:
return StaticWitnessLogicObj(get_sigma_normal_logic())


@lru_cache
@cache_argsless
def get_sigma_expert() -> StaticWitnessLogicObj:
return StaticWitnessLogicObj(get_sigma_expert_logic())

Expand Down
12 changes: 8 additions & 4 deletions worlds/witness/data/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from functools import lru_cache
from math import floor
from pkgutil import get_data
from random import random
Expand Down Expand Up @@ -103,10 +102,15 @@ def parse_lambda(lambda_string) -> WitnessRule:
return lambda_set


@lru_cache(maxsize=None)
_adjustment_file_cache = dict()


def get_adjustment_file(adjustment_file: str) -> List[str]:
data = get_data(__name__, adjustment_file).decode("utf-8")
return [line.strip() for line in data.split("\n")]
if adjustment_file not in _adjustment_file_cache:
data = get_data(__name__, adjustment_file).decode("utf-8")
_adjustment_file_cache[adjustment_file] = [line.strip() for line in data.split("\n")]

return _adjustment_file_cache[adjustment_file]


def get_disable_unrandomized_list() -> List[str]:
Expand Down
Loading