diff --git a/dist/DMDO-2404-py3-none-any.whl b/dist/DMDO-2404-py3-none-any.whl index 830840d..b38921f 100644 Binary files a/dist/DMDO-2404-py3-none-any.whl and b/dist/DMDO-2404-py3-none-any.whl differ diff --git a/src/DMDO/coordinator.py b/src/DMDO/coordinator.py index 810aaba..e7c255a 100644 --- a/src/DMDO/coordinator.py +++ b/src/DMDO/coordinator.py @@ -41,11 +41,11 @@ class coordinationData: class ADMM_data(coordinationData): beta: float = 1.3 gamma: float = 0.5 - q: np.ndarray = np.zeros([0,0]) - qold: np.ndarray = np.zeros([0,0]) + q: np.ndarray = None + qold: np.ndarray = None phi: float = 1.0 - v: np.ndarray = np.zeros([0,0]) - w: np.ndarray = np.zeros([0,0]) + v: np.ndarray = None + w: np.ndarray = None update_w: bool = False M_update_scheme: int = w_scheme.MEDIAN eps_qo: List = None @@ -53,6 +53,8 @@ class ADMM_data(coordinationData): save_q_in_out: bool = False eps_fo: List = None + + # COMPLETE: ADMM needs to be customized for this code @dataclass class ADMM(ADMM_data): @@ -76,6 +78,12 @@ def __init__(self, nsp, beta, budget, index_of_master_SP, display, scaling, mode self.eps_fo = [] self.index = index + self.q = np.zeros([0,0]) + self.qold = np.zeros([0,0]) + self.phi: float = 1.0 + self.v = np.zeros([0,0]) + self.w = np.zeros([0,0]) + def clone_point(self, p: variableData): self.var_group.append(p)