ltbams 0.9.9__py3-none-any.whl → 1.0.2__py3-none-any.whl

ams/routines/dcpf0.py

@@ -0,0 +1,196 @@
+"""
+DC power flow routines using PYPOWER.
+"""
+import logging
+
+from andes.shared import deg2rad
+from andes.utils.misc import elapsed
+
+from ams.routines.routine import RoutineBase
+from ams.opt import Var
+from ams.pypower import runpf
+from ams.pypower.core import ppoption
+
+from ams.io.pypower import system2ppc
+from ams.core.param import RParam
+
+logger = logging.getLogger(__name__)
+
+
+class DCPF0(RoutineBase):
+    """
+    DC power flow using PYPOWER.
+
+    This class is deprecated as of version 0.9.12 and will be removed in 1.1.0.
+
+    Notes
+    -----
+    1. DCPF is solved with PYPOWER ``runpf`` function.
+    2. DCPF formulation is not complete yet, but this does not affect the
+       results because the data are passed to PYPOWER for solving.
+    """
+
+    def __init__(self, system, config):
+        RoutineBase.__init__(self, system, config)
+        self.info = 'DC Power Flow'
+        self.type = 'PF'
+
+        self.ug = RParam(info='Gen connection status',
+                         name='ug', tex_name=r'u_{g}',
+                         model='StaticGen', src='u',
+                         no_parse=True)
+
+        # --- routine data ---
+        self.x = RParam(info="line reactance",
+                        name='x', tex_name='x',
+                        unit='p.u.',
+                        model='Line', src='x',)
+        self.tap = RParam(info="transformer branch tap ratio",
+                          name='tap', tex_name=r't_{ap}',
+                          model='Line', src='tap',
+                          unit='float',)
+        self.phi = RParam(info="transformer branch phase shift in rad",
+                          name='phi', tex_name=r'\phi',
+                          model='Line', src='phi',
+                          unit='radian',)
+
+        # --- load ---
+        self.pd = RParam(info='active deman',
+                         name='pd', tex_name=r'p_{d}',
+                         unit='p.u.',
+                         model='StaticLoad', src='p0')
+        # --- gen ---
+        self.pg = Var(info='Gen active power',
+                      unit='p.u.',
+                      name='pg', tex_name=r'p_{g}',
+                      model='StaticGen', src='p',)
+
+        # --- bus ---
+        self.aBus = Var(info='bus voltage angle',
+                        unit='rad',
+                        name='aBus', tex_name=r'a_{Bus}',
+                        model='Bus', src='a',)
+
+        # --- line flow ---
+        self.plf = Var(info='Line flow',
+                       unit='p.u.',
+                       name='plf', tex_name=r'p_{lf}',
+                       model='Line',)
+
+    def unpack(self, res):
+        """
+        Unpack results from PYPOWER.
+        """
+        system = self.system
+        mva = res['baseMVA']
+
+        # --- copy results from ppc into system algeb ---
+        # --- Bus ---
+        system.Bus.v.v = res['bus'][:, 7]               # voltage magnitude
+        system.Bus.a.v = res['bus'][:, 8] * deg2rad     # voltage angle
+
+        # --- PV ---
+        system.PV.p.v = res['gen'][system.Slack.n:, 1] / mva        # active power
+        system.PV.q.v = res['gen'][system.Slack.n:, 2] / mva        # reactive power
+
+        # --- Slack ---
+        system.Slack.p.v = res['gen'][:system.Slack.n, 1] / mva     # active power
+        system.Slack.q.v = res['gen'][:system.Slack.n, 2] / mva     # reactive power
+
+        # --- Line ---
+        self.plf.optz.value = res['branch'][:, 13] / mva  # line flow
+
+        # --- copy results from system algeb into routine algeb ---
+        for vname, var in self.vars.items():
+            owner = getattr(system, var.model)  # instance of owner, Model or Group
+            if var.src is None:          # skip if no source variable is specified
+                continue
+            elif hasattr(owner, 'group'):   # if owner is a Model instance
+                grp = getattr(system, owner.group)
+                idx = grp.get_all_idxes()
+            elif hasattr(owner, 'get_idx'):  # if owner is a Group instance
+                idx = owner.get_all_idxes()
+            else:
+                msg = f"Failed to find valid source variable `{owner.class_name}.{var.src}` for "
+                msg += f"{self.class_name}.{vname}, skip unpacking."
+                logger.warning(msg)
+                continue
+            try:
+                logger.debug(f"Unpacking {vname} into {owner.class_name}.{var.src}.")
+                var.optz.value = owner.get(src=var.src, attr='v', idx=idx)
+            except AttributeError:
+                logger.debug(f"Failed to unpack {vname} into {owner.class_name}.{var.src}.")
+                continue
+        self.system.recent = self.system.routines[self.class_name]
+        return True
+
+    def solve(self, method=None):
+        """
+        Solve DC power flow using PYPOWER.
+        """
+        ppc = system2ppc(self.system)
+        ppopt = ppoption(PF_DC=True)
+
+        res, sstats = runpf(casedata=ppc, ppopt=ppopt)
+        return res, sstats
+
+    def run(self, **kwargs):
+        """
+        Run DC pwoer flow.
+        *args and **kwargs go to `self.solve()`, which are not used yet.
+
+        Examples
+        --------
+        >>> ss = ams.load(ams.get_case('matpower/case14.m'))
+        >>> ss.DCPF.run()
+
+        Parameters
+        ----------
+        method : str
+            Placeholder for future use.
+
+        Returns
+        -------
+        exit_code : int
+            Exit code of the routine.
+        """
+        if not self.initialized:
+            self.init()
+        t0, _ = elapsed()
+
+        res, sstats = self.solve(**kwargs)
+        self.converged = res['success']
+        self.exit_code = 0 if res['success'] else 1
+        _, s = elapsed(t0)
+        self.exec_time = float(s.split(' ')[0])
+        n_iter = int(sstats['num_iters'])
+        n_iter_str = f"{n_iter} iterations " if n_iter > 1 else f"{n_iter} iteration "
+        if self.exit_code == 0:
+            msg = f"<{self.class_name}> solved in {s}, converged in "
+            msg += n_iter_str + f"with {sstats['solver_name']}."
+            logger.info(msg)
+            try:
+                self.unpack(res)
+            except Exception as e:
+                logger.error(f"Failed to unpack results from {self.class_name}.\n{e}")
+                return False
+            self.system.report()
+            return True
+        else:
+            msg = f"{self.class_name} failed in "
+            msg += f"{int(sstats['num_iters'])} iterations with "
+            msg += f"{sstats['solver_name']}!"
+            logger.warning(msg)
+            return False
+
+    def summary(self, **kwargs):
+        """
+        # TODO: Print power flow summary.
+        """
+        raise NotImplementedError
+
+    def enable(self, name):
+        raise NotImplementedError
+
+    def disable(self, name):
+        raise NotImplementedError

ams/routines/dopf.py

@@ -0,0 +1,150 @@
+"""
+Distributional optimal power flow (DOPF).
+"""
+import numpy as np
+
+from ams.core.param import RParam
+
+from ams.routines.dcopf import DCOPF
+
+from ams.opt import Var, Constraint, Objective
+
+
+class DOPF(DCOPF):
+    """
+    Linearzied distribution OPF, where power loss are ignored.
+
+    UNDER DEVELOPMENT!
+
+    Reference:
+
+    [1] L. Bai, J. Wang, C. Wang, C. Chen, and F. Li, “Distribution Locational Marginal Pricing (DLMP)
+    for Congestion Management and Voltage Support,” IEEE Trans. Power Syst., vol. 33, no. 4,
+    pp. 4061–4073, Jul. 2018, doi: 10.1109/TPWRS.2017.2767632.
+    """
+
+    def __init__(self, system, config):
+        DCOPF.__init__(self, system, config)
+        self.info = 'Linearzied distribution OPF'
+        self.type = 'DED'
+
+        # -- Data Section --
+        # ---  generator ---
+        self.qmax = RParam(info='generator maximum reactive power',
+                           name='qmax', tex_name=r'q_{max}', unit='p.u.',
+                           model='StaticGen', src='qmax',)
+        self.qmin = RParam(info='generator minimum reactive power',
+                           name='qmin', tex_name=r'q_{min}', unit='p.u.',
+                           model='StaticGen', src='qmin',)
+        # --- load ---
+        self.qd = RParam(info='reactive demand',
+                         name='qd', tex_name=r'q_{d}', unit='p.u.',
+                         model='StaticLoad', src='q0',)
+        # --- bus ---
+        self.vmax = RParam(info="Bus voltage upper limit",
+                           name='vmax', tex_name=r'v_{max}',
+                           unit='p.u.',
+                           model='Bus', src='vmax', no_parse=True,
+                           )
+        self.vmin = RParam(info="Bus voltage lower limit",
+                           name='vmin', tex_name=r'v_{min}',
+                           unit='p.u.',
+                           model='Bus', src='vmin', no_parse=True,)
+        # --- line ---
+        self.r = RParam(info='line resistance',
+                        name='r', tex_name='r', unit='p.u.',
+                        model='Line', src='r',
+                        no_parse=True,)
+        self.x = RParam(info='line reactance',
+                        name='x', tex_name='x', unit='p.u.',
+                        model='Line', src='x',
+                        no_parse=True,)
+        # --- Model Section ---
+        # --- generator ---
+        self.qg = Var(info='Gen reactive power',
+                      name='qg', tex_name=r'q_{g}', unit='p.u.',
+                      model='StaticGen', src='q',)
+        self.qglb = Constraint(name='qglb', is_eq=False,
+                               info='qg min',
+                               e_str='-qg + mul(ug, qmin)',)
+        self.qgub = Constraint(name='qgub', is_eq=False,
+                               info='qg max',
+                               e_str='qg - mul(ug, qmax)',)
+        # --- bus ---
+        self.v = Var(info='Bus voltage',
+                     name='v', tex_name=r'v',
+                     unit='p.u.',
+                     model='Bus', src='v')
+        self.vsq = Var(info='square of Bus voltage',
+                       name='vsq', tex_name=r'v^{2}', unit='p.u.',
+                       model='Bus',)
+        self.vu = Constraint(name='vu',
+                             info='Voltage upper limit',
+                             e_str='vsq - vmax**2',
+                             is_eq=False,)
+        self.vl = Constraint(name='vl',
+                             info='Voltage lower limit',
+                             e_str='-vsq + vmin**2',
+                             is_eq=False,)
+        # --- line ---
+        self.qlf = Var(info='line reactive power',
+                       name='qlf', tex_name=r'q_{lf}',
+                       unit='p.u.', model='Line',)
+        self.lvd = Constraint(info='line voltage drop',
+                              name='lvd', is_eq=True,
+                              e_str='CftT@vsq - (r * plf + x * qlf)',)
+        # --- power balance ---
+        # NOTE: following Eqn seems to be wrong, double check
+        # g_Q(\Theta, V, Q_g) = B_{bus}V\Theta + Q_{bus,shift} + Q_d + B_{sh} - C_gQ_g = 0
+        self.qb = Constraint(info='reactive power balance',
+                             name='qb', is_eq=True,
+                             e_str='sum(qd) - sum(qg)',)
+
+        # --- objective ---
+        # NOTE: no need to revise objective function
+
+    def _post_solve(self):
+        self.v.optz.value = np.sqrt(self.vsq.optz.value)
+        return super()._post_solve()
+
+
+class DOPFVIS(DOPF):
+    """
+    Linearzied distribution OPF with variables for virtual inertia and damping from from REGCV1,
+    where power loss are ignored.
+
+    UNDER DEVELOPMENT!
+
+    Reference:
+
+    [1] L. Bai, J. Wang, C. Wang, C. Chen, and F. Li, “Distribution Locational Marginal Pricing (DLMP)
+    for Congestion Management and Voltage Support,” IEEE Trans. Power Syst., vol. 33, no. 4,
+    pp. 4061–4073, Jul. 2018, doi: 10.1109/TPWRS.2017.2767632.
+    """
+
+    def __init__(self, system, config):
+        DOPF.__init__(self, system, config)
+
+        # --- params ---
+        self.cm = RParam(info='Virtual inertia cost',
+                         name='cm', src='cm',
+                         tex_name=r'c_{m}', unit=r'$/s',
+                         model='VSGCost',
+                         indexer='reg', imodel='VSG')
+        self.cd = RParam(info='Virtual damping cost',
+                         name='cd', src='cd',
+                         tex_name=r'c_{d}', unit=r'$/(p.u.)',
+                         model='VSGCost',
+                         indexer='reg', imodel='VSG',)
+        # --- vars ---
+        self.M = Var(info='Emulated startup time constant (M=2H) from REGCV1',
+                     name='M', tex_name=r'M', unit='s',
+                     model='VSG',)
+        self.D = Var(info='Emulated damping coefficient from REGCV1',
+                     name='D', tex_name=r'D', unit='p.u.',
+                     model='VSG',)
+        obj = 'sum(c2 * pg**2 + c1 * pg + ug * c0 + cm * M + cd * D)'
+        self.obj = Objective(name='tc',
+                             info='total cost', unit='$',
+                             e_str=obj,
+                             sense='min',)

ams/routines/ed.py

@@ -0,0 +1,312 @@
+"""
+Economic dispatch routines.
+"""
+import logging
+import numpy as np
+
+from ams.core.param import RParam
+from ams.core.service import (NumOpDual, NumHstack,
+                              RampSub, NumOp, LoadScale)
+
+from ams.routines.rted import RTED, DGBase, ESD1Base
+
+from ams.opt import Var, Constraint
+
+logger = logging.getLogger(__name__)
+
+
+class SRBase:
+    """
+    Base class for spinning reserve.
+    """
+
+    def __init__(self) -> None:
+        self.dsrp = RParam(info='spinning reserve requirement in percentage',
+                           name='dsr', tex_name=r'd_{sr}',
+                           model='SR', src='demand',
+                           unit='%',)
+        self.csr = RParam(info='cost for spinning reserve',
+                          name='csr', tex_name=r'c_{sr}',
+                          model='SRCost', src='csr',
+                          unit=r'$/(p.u.*h)',
+                          indexer='gen', imodel='StaticGen',)
+
+        self.prs = Var(name='prs', tex_name=r'p_{r,s}',
+                       info='spinning reserve', unit='p.u.',
+                       model='StaticGen', nonneg=True,)
+
+        self.dsrpz = NumOpDual(u=self.pdz, u2=self.dsrp, fun=np.multiply,
+                               name='dsrpz', tex_name=r'd_{s,r, p, z}',
+                               info='zonal spinning reserve requirement in percentage',)
+        self.dsr = NumOpDual(u=self.dsrpz, u2=self.sd, fun=np.multiply,
+                             rfun=np.transpose,
+                             name='dsr', tex_name=r'd_{s,r,z}',
+                             info='zonal spinning reserve requirement',)
+
+        # NOTE: define e_str in the scheduling model
+        self.prsb = Constraint(info='spinning reserve balance',
+                               name='prsb', is_eq=True,)
+        self.rsr = Constraint(info='spinning reserve requirement',
+                              name='rsr', is_eq=False,)
+
+
+class MPBase:
+    """
+    Base class for multi-period scheduling.
+    """
+
+    def __init__(self) -> None:
+        # NOTE: Setting `ED.scale.owner` to `Horizon` will cause an error when calling `ED.scale.v`.
+        # This is because `Horizon` is a group that only contains the model `TimeSlot`.
+        # The `get` method of `Horizon` calls `andes.models.group.GroupBase.get` and results in an error.
+        self.sd = RParam(info='zonal load factor for ED',
+                         name='sd', tex_name=r's_{d}',
+                         src='sd', model='EDTSlot')
+
+        # NOTE: update timeslot.model in dispatch model if necessary
+        self.timeslot = RParam(info='Time slot for multi-period ED',
+                               name='timeslot', tex_name=r't_{s,idx}',
+                               src='idx', model='EDTSlot',
+                               no_parse=True)
+
+        self.tlv = NumOp(u=self.timeslot, fun=np.ones_like,
+                         args=dict(dtype=float),
+                         expand_dims=0,
+                         name='tlv', tex_name=r'1_{tl}',
+                         info='time length vector',
+                         no_parse=True)
+
+        self.pds = LoadScale(u=self.pd, sd=self.sd,
+                             name='pds', tex_name=r'p_{d,s}',
+                             info='Scaled load',)
+
+        self.R30 = RParam(info='30-min ramp rate',
+                          name='R30', tex_name=r'R_{30}',
+                          src='R30', unit='p.u./h',
+                          model='StaticGen', no_parse=True,)
+        self.Mr = RampSub(u=self.pg, name='Mr', tex_name=r'M_{r}',
+                          info='Subtraction matrix for ramping',
+                          no_parse=True, sparse=True,)
+        self.RR30 = NumHstack(u=self.R30, ref=self.Mr,
+                              name='RR30', tex_name=r'R_{30,R}',
+                              info='Repeated ramp rate', no_parse=True,)
+
+        items_to_expand = ['ctrl', 'c0', 'pmax', 'pmin', 'pg0', 'rate_a',
+                           'Pfinj', 'Pbusinj', 'gsh', 'ul']
+        for item in items_to_expand:
+            self.__dict__[item].expand_dims = 1
+
+        # NOTE: extend pg to 2D matrix: row for gen and col for timeslot
+        self.pg.horizon = self.timeslot
+        self.pg.info = '2D Gen power'
+        self.aBus.horizon = self.timeslot
+        self.aBus.info = '2D Bus angle'
+        self.vBus.horizon = self.timeslot
+        self.vBus.info = '2D Bus voltage'
+        self.pi.horizon = self.timeslot
+
+
+class ED(RTED, MPBase, SRBase):
+    """
+    DC-based multi-period economic dispatch (ED).
+    Dispath interval ``config.t`` (:math:`T_{cfg}`) is introduced,
+    1 [Hour] by default.
+
+    ED extends DCOPF as follows:
+
+    - Vars ``pg``, ``pru``, ``prd`` are extended to 2D
+    - 2D Vars ``rgu`` and ``rgd`` are introduced
+    - Param ``ug`` is sourced from ``EDTSlot.ug`` as generator commitment
+
+    Notes
+    -----
+    1. Formulations has been adjusted with interval ``config.t``
+
+    2. The tie-line flow is not implemented in this model.
+
+    3. `EDTSlot.ug` is used instead of `StaticGen.u` for generator commitment.
+    """
+
+    def __init__(self, system, config):
+        RTED.__init__(self, system, config)
+        MPBase.__init__(self)
+        SRBase.__init__(self)
+
+        self.config.t = 1  # scheduling interval in hour
+        self.config.add_extra("_help",
+                              t="time interval in hours",
+                              )
+
+        self.info = 'Economic dispatch'
+        self.type = 'DCED'
+
+        self.ug.info = 'unit commitment decisions'
+        self.ug.model = 'EDTSlot'
+        self.ug.src = 'ug'
+        # self.ug.tex_name = r'u_{g}',
+
+        self.dud.expand_dims = 1
+        self.ddd.expand_dims = 1
+        self.amin.expand_dims = 1
+        self.amax.expand_dims = 1
+
+        # --- Data Section ---
+        self.ugt = NumOp(u=self.ug, fun=np.transpose,
+                         name='ugt', tex_name=r'u_{g}',
+                         info='input ug transpose',
+                         no_parse=True)
+
+        # --- Model Section ---
+        # --- gen ---
+        self.ctrle.u2 = self.ugt
+        self.nctrle.u2 = self.ugt
+        pmaxe = 'mul(mul(nctrle, pg0), tlv) + mul(mul(ctrle, tlv), pmax)'
+        self.pmaxe.e_str = pmaxe
+        self.pmaxe.horizon = self.timeslot
+        pmine = 'mul(mul(nctrle, pg0), tlv) + mul(mul(ctrle, tlv), pmin)'
+        self.pmine.e_str = pmine
+        self.pmine.horizon = self.timeslot
+        self.pglb.e_str = '-pg + pmine'
+        self.pgub.e_str = 'pg - pmaxe'
+
+        self.pru.horizon = self.timeslot
+        self.pru.info = '2D RegUp power'
+        self.prd.horizon = self.timeslot
+        self.prd.info = '2D RegDn power'
+
+        self.prs.horizon = self.timeslot
+        self.prsb.e_str = 'mul(ugt, pmax@tlv - pg) - prs'
+        self.rsr.e_str = '-gs@prs + dsr'
+
+        # --- line ---
+        self.plf.horizon = self.timeslot
+        self.plf.info = '2D Line flow'
+        self.plflb.e_str = '-Bf@aBus - Pfinj@tlv - mul(ul, rate_a)@tlv'
+        self.plfub.e_str = 'Bf@aBus + Pfinj@tlv - mul(ul, rate_a)@tlv'
+        self.alflb.e_str = '-CftT@aBus + amin@tlv'
+        self.alfub.e_str = 'CftT@aBus - amax@tlv'
+
+        self.plf.e_str = 'Bf@aBus + Pfinj@tlv'
+
+        # --- power balance ---
+        self.pb.e_str = 'Bbus@aBus + Pbusinj@tlv + Cl@pds + Csh@gsh@tlv - Cg@pg'
+
+        # --- ramping ---
+        self.rbu.e_str = 'gs@mul(ugt, pru) - mul(dud, tlv)'
+        self.rbd.e_str = 'gs@mul(ugt, prd) - mul(ddd, tlv)'
+
+        self.rru.e_str = 'pg + pru - mul(mul(ugt, pmax), tlv)'
+        self.rrd.e_str = '-pg + prd + mul(mul(ugt, pmin), tlv)'
+
+        self.rgu.e_str = 'pg @ Mr - t dot RR30'
+        self.rgd.e_str = '-pg @ Mr - t dot RR30'
+
+        self.rgu0 = Constraint(name='rgu0',
+                               info='Initial gen ramping up',
+                               e_str='mul(ugt[:, 0], pg[:, 0] - pg0[:, 0] - R30)',
+                               is_eq=False,)
+        self.rgd0 = Constraint(name='rgd0',
+                               info='Initial gen ramping down',
+                               e_str='mul(ugt[:, 0], -pg[:, 0] + pg0[:, 0] - R30)',
+                               is_eq=False,)
+
+        # --- objective ---
+        cost = 'sum(t**2 dot c2 @ pg**2)'
+        cost += '+ t dot sum(c1 @ pg + csr @ prs)'
+        cost += '+ sum(mul(ugt, mul(c0, tlv)))'
+        self.obj.e_str = cost
+
+    def dc2ac(self, **kwargs):
+        """
+        AC conversion ``dc2ac`` is not implemented yet for
+        multi-period scheduling.
+        """
+        return NotImplementedError
+
+    def unpack(self, **kwargs):
+        """
+        Multi-period scheduling will not unpack results from
+        solver into devices.
+
+        # TODO: unpack first period results, and allow input
+        # to specify which period to unpack.
+        """
+        return None
+
+
+class EDDG(ED, DGBase):
+    """
+    ED with distributed generation :ref:`DG`.
+
+    Note that EDDG only inlcudes DG output power. If ESD1 is included,
+    EDES should be used instead, otherwise there is no SOC.
+    """
+
+    def __init__(self, system, config):
+        ED.__init__(self, system, config)
+        DGBase.__init__(self)
+
+        self.info = 'Economic dispatch with distributed generation'
+        self.type = 'DCED'
+
+        # NOTE: extend vars to 2D
+        self.pgdg.horizon = self.timeslot
+
+
+class ESD1MPBase(ESD1Base):
+    """
+    Extended base class for energy storage in multi-period scheduling.
+    """
+
+    def __init__(self):
+        ESD1Base.__init__(self)
+
+        self.Mre = RampSub(u=self.SOC, name='Mre', tex_name=r'M_{r,ES}',
+                           info='Subtraction matrix for SOC',
+                           no_parse=True, sparse=True,)
+        self.EnR = NumHstack(u=self.En, ref=self.Mre,
+                             name='EnR', tex_name=r'E_{n,R}',
+                             info='Repeated En as 2D matrix, (ng, ng-1)')
+        self.EtaCR = NumHstack(u=self.EtaC, ref=self.Mre,
+                               name='EtaCR', tex_name=r'\eta_{c,R}',
+                               info='Repeated Etac as 2D matrix, (ng, ng-1)')
+        self.REtaDR = NumHstack(u=self.REtaD, ref=self.Mre,
+                                name='REtaDR', tex_name=r'R_{\eta_d,R}',
+                                info='Repeated REtaD as 2D matrix, (ng, ng-1)')
+        SOCb = 'mul(EnR, SOC @ Mre) - t dot mul(EtaCR, zce[:, 1:])'
+        SOCb += ' + t dot mul(REtaDR, zde[:, 1:])'
+        self.SOCb.e_str = SOCb
+
+        SOCb0 = 'mul(En, SOC[:, 0] - SOCinit) - t dot mul(EtaC, zce[:, 0])'
+        SOCb0 += ' + t dot mul(REtaD, zde[:, 0])'
+        self.SOCb0 = Constraint(name='SOCb0', is_eq=True,
+                                info='ESD1 SOC initial balance',
+                                e_str=SOCb0,)
+
+        self.SOCr = Constraint(name='SOCr', is_eq=True,
+                               info='SOC requirement',
+                               e_str='SOC[:, -1] - SOCinit',)
+
+
+class EDES(ED, ESD1MPBase):
+    """
+    ED with energy storage :ref:`ESD1`.
+    The bilinear term in the formulation is linearized with big-M method.
+    """
+
+    def __init__(self, system, config):
+        ED.__init__(self, system, config)
+        ESD1MPBase.__init__(self)
+
+        self.info = 'Economic dispatch with energy storage'
+        self.type = 'DCED'
+
+        # NOTE: extend vars to 2D
+        self.pgdg.horizon = self.timeslot
+        self.SOC.horizon = self.timeslot
+        self.pce.horizon = self.timeslot
+        self.pde.horizon = self.timeslot
+        self.uce.horizon = self.timeslot
+        self.ude.horizon = self.timeslot
+        self.zce.horizon = self.timeslot
+        self.zde.horizon = self.timeslot