refactor: rename the trait for comouting circuit values in legacy to match the same modification in kernel
This commit is contained in:
@@ -4,7 +4,7 @@ from typing import Iterable, Iterator
|
||||
from functools import cached_property
|
||||
from .common import Resolver
|
||||
from ..dataset import DatasetCollection, Dataset
|
||||
from ..common import Circuit, DeviceKind, JointKind, CircuitValueTrait
|
||||
from ..common import Circuit, DeviceKind, JointKind, CircuitCalculator
|
||||
from ..query import Request, Response
|
||||
|
||||
|
||||
@@ -15,12 +15,12 @@ class BfsItem:
|
||||
|
||||
__circuit: Circuit
|
||||
"""The circuit represented by this item."""
|
||||
__cv_trait: CircuitValueTrait
|
||||
__ccalc: CircuitCalculator
|
||||
"""The trait for computing circuit values."""
|
||||
|
||||
def __init__(self, circuit: Circuit, cv_trait: CircuitValueTrait):
|
||||
def __init__(self, circuit: Circuit, ccalc: CircuitCalculator):
|
||||
self.__circuit = circuit
|
||||
self.__cv_trait = cv_trait
|
||||
self.__ccalc = ccalc
|
||||
|
||||
@property
|
||||
def circuit(self) -> Circuit:
|
||||
@@ -33,7 +33,7 @@ class BfsItem:
|
||||
|
||||
:return: The computed value.
|
||||
"""
|
||||
return self.__cv_trait.value(self.__circuit)
|
||||
return self.__ccalc.value(self.__circuit)
|
||||
|
||||
@cached_property
|
||||
def unsigned_difference(self) -> float:
|
||||
@@ -42,7 +42,7 @@ class BfsItem:
|
||||
|
||||
:return: The unsigned difference.
|
||||
"""
|
||||
return self.__cv_trait.unsigned_difference(self.__circuit, value=self.value)
|
||||
return self.__ccalc.unsigned_difference(self.__circuit, value=self.value)
|
||||
|
||||
|
||||
class ResultBucket(Iterable[BfsItem]):
|
||||
@@ -223,10 +223,10 @@ class BfsResolver(Resolver):
|
||||
|
||||
@staticmethod
|
||||
def __bfs_iteration(
|
||||
dataset: Dataset, cv_trait: CircuitValueTrait
|
||||
dataset: Dataset, ccalc: CircuitCalculator
|
||||
) -> Iterator[BfsItem]:
|
||||
return (
|
||||
BfsItem(circuit, cv_trait)
|
||||
BfsItem(circuit, ccalc)
|
||||
for circuit in chain(
|
||||
BfsResolver.iter_one_device_circuit(dataset),
|
||||
BfsResolver.iter_two_devices_circuit(dataset),
|
||||
@@ -247,8 +247,8 @@ class BfsResolver(Resolver):
|
||||
|
||||
# Iterate circuit item one by one
|
||||
bucket = ResultBucket(request.count_limit)
|
||||
cv_trait = CircuitValueTrait(request.device_kind, request.target_value)
|
||||
for item in BfsResolver.__bfs_iteration(dataset, cv_trait):
|
||||
ccalc = CircuitCalculator(request.device_kind, request.target_value)
|
||||
for item in BfsResolver.__bfs_iteration(dataset, ccalc):
|
||||
# If circuit absolute difference is out of tolerance, skip it directly.
|
||||
if item.unsigned_difference > request.tolerance:
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user