feat: still update basic concepts
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
from typing import Iterator
|
||||
from .common import Resolver, ResolverRequest, ResolverResult, ResultPriority
|
||||
from ..dataset import DataSet
|
||||
from ..dataset import DatasetCollection
|
||||
|
||||
class AStarResolver(Resolver):
|
||||
"""
|
||||
A resolver that uses A* algorithm to find the best matching circuit.
|
||||
"""
|
||||
|
||||
def __init__(self, dataset: DataSet):
|
||||
def __init__(self, dataset: DatasetCollection):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ import struct
|
||||
from typing import Iterator, BinaryIO
|
||||
from pathlib import Path
|
||||
from .common import Resolver, ResolverRequest, ResolverResult, ResultPriority
|
||||
from ..dataset import DataSet
|
||||
from ..common import Circuit, CircuitJoint, JointKind, LcrConnException
|
||||
from ..dataset import DatasetCollection
|
||||
from ..common import Circuit, SubCircuit, JointKind, LcrConnException
|
||||
|
||||
class LutResolver(Resolver):
|
||||
"""
|
||||
@@ -16,7 +16,7 @@ class LutResolver(Resolver):
|
||||
self.lut = lut
|
||||
|
||||
@staticmethod
|
||||
def from_dataset(dataset: DataSet) -> 'LutResolver':
|
||||
def from_dataset(dataset: DatasetCollection) -> 'LutResolver':
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
@@ -61,14 +61,14 @@ class LutItem:
|
||||
for _ in range(cnt):
|
||||
j = JointKind.SERIES if _read_bool(f) else JointKind.PARALLEL
|
||||
dev = _read_double(f)
|
||||
joint = CircuitJoint(j, dev)
|
||||
joint = SubCircuit(j, dev)
|
||||
circuit.add_joint(joint)
|
||||
|
||||
return LutItem(circuit)
|
||||
|
||||
def save_as_cache(self, f: BinaryIO) -> None:
|
||||
_write_int(f, self.circuit.len_devices())
|
||||
_write_double(f, self.circuit.device_value)
|
||||
_write_double(f, self.circuit.__first_device_value)
|
||||
for joint in self.circuit.joints():
|
||||
_write_bool(f, joint.kind == JointKind.SERIES)
|
||||
_write_double(f, joint.value)
|
||||
|
||||
Reference in New Issue
Block a user