jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

various fixes

Browse Source
This commit is contained in:
Jan Petykiewicz 2023-01-12 23:06:12 -08:00 committed by jan
parent e3511ed852
commit f7b8f2db0c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
masque/library.py
View File

@ -11,6 +11,7 @@ import struct
import re import re
from pprint import pformat from pprint import pformat
from collections import defaultdict from collections import defaultdict
from abc import ABCMeta, abstractmethod
import numpy import numpy
from numpy.typing import ArrayLike, NDArray, NDArray from numpy.typing import ArrayLike, NDArray, NDArray
@ -29,6 +30,7 @@ logger = logging.getLogger(__name__)
visitor_function_t = Callable[['Pattern', Tuple['Pattern'], Dict, NDArray[numpy.float64]], 'Pattern'] visitor_function_t = Callable[['Pattern', Tuple['Pattern'], Dict, NDArray[numpy.float64]], 'Pattern']
L = TypeVar('L', bound='Library') L = TypeVar('L', bound='Library')
ML = TypeVar('ML', bound='MutableLibrary')
LL = TypeVar('LL', bound='LazyLibrary') LL = TypeVar('LL', bound='LazyLibrary')
@ -268,11 +270,11 @@ class MutableLibrary(Library, metaclass=ABCMeta):
pass pass
@abstractmethod @abstractmethod
def _copy(self: ML, other: ML, key: str) -> None: def _merge(self: ML, other: ML, key: str) -> None:
pass pass
def add( def add(
self: WL, self: ML,
other: L, other: L,
use_ours: Callable[[str], bool] = lambda name: False, use_ours: Callable[[str], bool] = lambda name: False,
use_theirs: Callable[[str], bool] = lambda name: False, use_theirs: Callable[[str], bool] = lambda name: False,