ltbams 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

ams/io/matpower.py

@@ -2,9 +2,10 @@
 MATPOWER parser.
 """
 import logging
+import re
 import numpy as np
 
-from andes.io.matpower import m2mpc
+from andes.io import read_file_like
 from andes.shared import deg2rad, rad2deg
 
 logger = logging.getLogger(__name__)
@@ -29,6 +30,151 @@ def read(system, file):
     return mpc2system(mpc, system)
 
 
+def m2mpc(infile: str) -> dict:
+    """
+    Parse a MATPOWER file and return a dictionary containing the parsed data.
+
+    This function processes MATPOWER case files and extracts relevant fields
+    into a structured dictionary. It is revised from ``andes.io.matpower.m2mpc``.
+
+    Supported fields include:
+    - `baseMVA`: The system base power in MVA.
+    - `bus`: Bus data, including voltage, load, and generation information.
+    - `bus_name`: Names of the buses (if available).
+    - `gen`: Generator data, including power limits and voltage setpoints.
+    - `branch`: Branch data, including line impedances and ratings.
+    - `gencost`: Generator cost data (parsed but not used in this implementation).
+    - `areas`: Area data (parsed but not used in this implementation).
+    - `gentype`: Generator type information (if available).
+    - `genfuel`: Generator fuel type information (if available).
+
+    Parameters
+    ----------
+    infile : str
+        Path to the MATPOWER file to be parsed.
+
+    Returns
+    -------
+    dict
+        A dictionary containing the parsed MATPOWER data, where keys correspond
+        to MATPOWER struct names and values are numpy arrays or lists.
+    """
+
+    func = re.compile(r'function\s')
+    mva = re.compile(r'\s*mpc.baseMVA\s*=\s*')
+    bus = re.compile(r'\s*mpc.bus\s*=\s*\[?')
+    gen = re.compile(r'\s*mpc.gen\s*=\s*\[')
+    branch = re.compile(r'\s*mpc.branch\s*=\s*\[')
+    area = re.compile(r'\s*mpc.areas\s*=\s*\[')
+    gencost = re.compile(r'\s*mpc.gencost\s*=\s*\[')
+    bus_name = re.compile(r'\s*mpc.bus_name\s*=\s*{')
+    gentype = re.compile(r'\s*mpc.gentype\s*=\s*{')
+    genfuel = re.compile(r'\s*mpc.genfuel\s*=\s*{')
+    end = re.compile(r'\s*[\];}]')
+    has_digit = re.compile(r'.*\d+\s*]?;?')
+
+    field = None
+    info = True
+
+    mpc = {
+        'version': 2,  # not in use
+        'baseMVA': 100,
+        'bus': [],
+        'gen': [],
+        'branch': [],
+        'area': [],
+        'gencost': [],
+        'bus_name': [],
+        'gentype': [],
+        'genfuel': [],
+    }
+
+    input_list = read_file_like(infile)
+
+    for line in input_list:
+        line = line.strip().rstrip(';')
+        if not line:
+            continue
+        elif func.search(line):  # skip function declaration
+            continue
+        elif len(line.split('%')[0]) == 0:
+            if info is True:
+                logger.info(line[1:])
+                info = False
+            else:
+                continue
+        elif mva.search(line):
+            mpc["baseMVA"] = float(line.split('=')[1])
+
+        if not field:
+            if bus.search(line):
+                field = 'bus'
+            elif gen.search(line):
+                field = 'gen'
+            elif branch.search(line):
+                field = 'branch'
+            elif area.search(line):
+                field = 'area'
+            elif gencost.search(line):
+                field = 'gencost'
+            elif bus_name.search(line):
+                field = 'bus_name'
+            elif gentype.search(line):
+                field = 'gentype'
+            elif genfuel.search(line):
+                field = 'genfuel'
+            else:
+                continue
+        elif end.search(line):
+            field = None
+            continue
+
+        # parse mpc sections
+        if field:
+            if line.find('=') >= 0:
+                line = line.split('=')[1]
+            if line.find('[') >= 0:
+                line = re.sub(r'\[', '', line)
+            elif line.find('{') >= 0:
+                line = re.sub(r'{', '', line)
+
+            if field in ['bus_name', 'gentype', 'genfuel']:
+                # Handle string-based fields
+                line = line.split(';')
+                data = [i.strip('\'').strip() for i in line if i.strip()]
+                mpc[field].extend(data)
+            else:
+                if not has_digit.search(line):
+                    continue
+                line = line.split('%')[0].strip()
+                line = line.split(';')
+                for item in line:
+                    if not has_digit.search(item):
+                        continue
+                    try:
+                        data = np.array([float(val) for val in item.split()])
+                    except Exception as e:
+                        logger.error('Error parsing "%s"', infile)
+                        raise e
+                    mpc[field].append(data)
+
+    # convert mpc to np array
+    mpc_array = dict()
+    for key, val in mpc.items():
+        if isinstance(val, (float, int)):
+            mpc_array[key] = val
+        elif isinstance(val, list):
+            if len(val) == 0:
+                continue
+            if key in ['bus_name', 'gentype', 'genfuel']:
+                mpc_array[key] = np.array(val, dtype=object)
+            else:
+                mpc_array[key] = np.array(val)
+        else:
+            raise NotImplementedError("Unknown type for mpc, ", type(val))
+    return mpc_array
+
+
 def mpc2system(mpc: dict, system) -> bool:
     """
     Load an mpc dict into an empty AMS system.
@@ -97,7 +243,20 @@ def mpc2system(mpc: dict, system) -> bool:
         mpc_gen[:, 19] = system.PV.Rq.default * base_mva / 60
     else:
         mpc_gen = mpc['gen']
-    for data in mpc_gen:
+
+    # Ensure 'gentype' and 'genfuel' keys exist in mpc, with default values if missing
+    gentype = mpc.get('gentype', [''] * mpc_gen.shape[0])
+    genfuel = mpc.get('genfuel', [''] * mpc_gen.shape[0])
+
+    # Validate lengths of 'gentype' and 'genfuel' against the number of generators
+    if len(gentype) != mpc_gen.shape[0]:
+        raise ValueError(
+            f"'gentype' length ({len(gentype)}) does not match the number of generators ({mpc_gen.shape[0]})")
+    if len(genfuel) != mpc_gen.shape[0]:
+        raise ValueError(
+            f"'genfuel' length ({len(genfuel)}) does not match the number of generators ({mpc_gen.shape[0]})")
+
+    for data, gt, gf in zip(mpc_gen, gentype, genfuel):
         # bus  pg  qg  qmax  qmin  vg  mbase  status  pmax  pmin
         # 0    1   2   3     4     5   6      7       8     9
         # pc1  pc2  qc1min  qc1max  qc2min  qc2max  ramp_agc  ramp_10
@@ -142,7 +301,7 @@ def mpc2system(mpc: dict, system) -> bool:
                        Qc2min=qc2min, Qc2max=qc2max,
                        Ragc=ramp_agc, R10=ramp_10,
                        R30=ramp_30, Rq=ramp_q,
-                       apf=apf)
+                       apf=apf, gentype=gt, genfuel=gf)
         else:
             system.add('PV', idx=gen_idx, bus=bus_idx, busr=bus_idx,
                        name=None,
@@ -155,7 +314,7 @@ def mpc2system(mpc: dict, system) -> bool:
                        Qc2min=qc2min, Qc2max=qc2max,
                        Ragc=ramp_agc, R10=ramp_10,
                        R30=ramp_30, Rq=ramp_q,
-                       apf=apf)
+                       apf=apf, gentype=gt, genfuel=gf)
 
     for data in mpc['branch']:
         # fbus	tbus	r	x	b	rateA	rateB	rateC	ratio	angle
@@ -204,9 +363,8 @@ def mpc2system(mpc: dict, system) -> bool:
         gen_idx = np.arange(mpc['gen'].shape[0]) + 1
         mpc_cost = mpc['gencost']
         if mpc_cost[0, 0] == 1:
-            logger.warning("Type 1 gencost detected. "
-                           "This is not supported in AMS. "
-                           "Default type 2 cost parameters will be used as a fallback."
+            logger.warning("Type 1 gencost detected, which is not supported in AMS.\n"
+                           "Default type 2 cost parameters will be used as a fallback.\n"
                            "It is recommended to manually convert the gencost data to type 2.")
             mpc_cost = np.repeat(np.array([[2, 0, 0, 3, 0, 0, 0]]),
                                  mpc_cost.shape[0], axis=0)

ams/io/psse.py

@@ -1,5 +1,5 @@
 """
-Excel reader and writer for AMS.
+PSS/E .raw reader for AMS.
 This module is the existing module in ``andes.io.psse``.
 """
 

ams/models/__init__.py

@@ -18,7 +18,7 @@ ams_file_classes = list([
     ('reserve', ['SFR', 'SR', 'NSR', 'VSGR']),
     ('cost', ['GCost', 'SFRCost', 'SRCost', 'NSRCost', 'VSGCost']),
     ('cost', ['DCost']),
-    ('timeslot', ['TimeSlot', 'EDTSlot', 'UCTSlot']),
+    ('timeslot', ['EDTSlot', 'UCTSlot']),
 ])
 
 file_classes = ams_file_classes

ams/models/group.py

@@ -175,20 +175,91 @@ class Reserve(GroupBase):
 
 class StaticGen(GroupBase):
     """
-    Generator group.
+    Static Generator Group.
+
+    The generator types and fuel types are referenced from MATPOWER.
+
+    Generator Types
+    ---------------
+    The following codes represent the types of generators:
+        - BA  : Energy Storage, Battery
+        - CE  : Energy Storage, Compressed Air
+        - CP  : Energy Storage, Concentrated Solar Power
+        - FW  : Energy Storage, Flywheel
+        - PS  : Hydraulic Turbine, Reversible (pumped storage)
+        - ES  : Energy Storage, Other
+        - ST  : Steam Turbine (includes nuclear, geothermal, and solar steam)
+        - GT  : Combustion (Gas) Turbine
+        - IC  : Internal Combustion Engine (diesel, piston, reciprocating)
+        - CA  : Combined Cycle Steam Part
+        - CT  : Combined Cycle Combustion Turbine Part
+        - CS  : Combined Cycle Single Shaft
+        - CC  : Combined Cycle Total Unit
+        - HA  : Hydrokinetic, Axial Flow Turbine
+        - HB  : Hydrokinetic, Wave Buoy
+        - HK  : Hydrokinetic, Other
+        - HY  : Hydroelectric Turbine
+        - BT  : Turbines Used in a Binary Cycle
+        - PV  : Photovoltaic
+        - WT  : Wind Turbine, Onshore
+        - WS  : Wind Turbine, Offshore
+        - FC  : Fuel Cell
+        - OT  : Other
+        - UN  : Unknown
+        - JE  : Jet Engine
+        - NB  : ST - Boiling Water Nuclear Reactor
+        - NG  : ST - Graphite Nuclear Reactor
+        - NH  : ST - High Temperature Gas Nuclear Reactor
+        - NP  : ST - Pressurized Water Nuclear Reactor
+        - IT  : Internal Combustion Turbo Charged
+        - SC  : Synchronous Condenser
+        - DC  : DC ties
+        - MP  : Motor/Pump
+        - W1  : Wind Turbine, Type 1
+        - W2  : Wind Turbine, Type 2
+        - W3  : Wind Turbine, Type 3
+        - W4  : Wind Turbine, Type 4
+        - SV  : Static Var Compensator
+        - DL  : Dispatchable Load
+
+    Fuel Types
+    ----------
+    The following codes represent the fuel types:
+        - biomass     : Biomass
+        - coal        : Coal
+        - dfo         : Distillate Fuel Oil
+        - geothermal  : Geothermal
+        - hydro       : Hydro
+        - hydrops     : Hydro Pumped Storage
+        - jetfuel     : Jet Fuel
+        - lng         : Liquefied Natural Gas
+        - ng          : Natural Gas
+        - nuclear     : Nuclear
+        - oil         : Unspecified Oil
+        - refuse      : Refuse, Municipal Solid Waste
+        - rfo         : Residual Fuel Oil
+        - solar       : Solar
+        - syncgen     : Synchronous Condenser
+        - wasteheat   : Waste Heat
+        - wind        : Wind
+        - wood        : Wood or Wood Waste
+        - other       : Other
+        - unknown     : Unknown
+        - dl          : Dispatchable Load
+        - ess         : Energy Storage System
 
     Notes
     -----
-    For co-simulation with ANDES, check
-    `ANDES StaticGen <https://docs.andes.app/en/latest/groupdoc/StaticGen.html#staticgen>`_
-    for replacing static generators with dynamic generators.
+    For co-simulation with ANDES, refer to the `ANDES StaticGen Documentation
+    <https://docs.andes.app/en/latest/groupdoc/StaticGen.html#staticgen>`_ for
+    replacing static generators with dynamic generators.
     """
 
     def __init__(self):
         super().__init__()
         self.common_params.extend(('bus', 'Sn', 'Vn', 'p0', 'q0', 'ra', 'xs', 'subidx',
                                    'pmax', 'pmin', 'pg0', 'ctrl', 'R10', 'td1', 'td2',
-                                   'zone'))
+                                   'area', 'zone', 'gentype', 'genfuel'))
         self.common_vars.extend(('p', 'q'))
 
 
@@ -211,7 +282,7 @@ class StaticLoad(GroupBase):
 
     def __init__(self):
         super().__init__()
-        self.common_params.extend(('bus', 'p0', 'q0', 'ctrl', 'zone'))
+        self.common_params.extend(('bus', 'p0', 'q0', 'ctrl', 'area', 'zone'))
 
 
 class StaticShunt(GroupBase):

ams/models/line.py

@@ -1,7 +1,7 @@
 from andes.models.line.line import LineData
 from andes.models.line.jumper import JumperData
 from andes.core.param import NumParam
-from andes.shared import deg2rad, np, spmatrix
+from andes.shared import deg2rad
 
 from ams.core.model import Model
 
@@ -18,8 +18,8 @@ class Line(LineData, Model):
 
     Notes
     -----
-    There is a known issue that adding Algeb ``ud`` will cause Line.algebs run into
-    AttributeError: 'NoneType' object has no attribute 'n'. Not figured out why yet.
+    1. Adding Algeb ``ud`` causes Line.algebs to encounter an AttributeError: 'NoneType'
+       object has no attribute 'n'. The root cause is still under investigation.
     """
 
     def __init__(self, system=None, config=None) -> None:
@@ -49,167 +49,6 @@ class Line(LineData, Model):
         self.a1a = None
         self.a2a = None
 
-    # NOTE: following code are minly copied from `andes.models.line.Line`
-    # and they are not fully verified
-    # potential issues:
-    # `build_Bp` contains 'fdxb', which is not included in the input parameters,
-    # and the results are the negative of `Bbus` from `makeBdc` in PYPOWER
-    # `build_Bpp` ignores the line resistance for all three methods
-    # `build_Bdc` results are the negative of `Bbus` from `makeBdc` in PYPOWER
-    # `build_y` results have inignorable differences at diagonal elements with `makeYbus` in PYPOWER
-
-    def build_y(self):
-        """
-        Build bus admittance matrix. Copied from ``andes.models.line.line.Line``.
-
-        Returns
-        -------
-        Y : spmatrix
-            Bus admittance matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        y1 = self.u.v * (self.g1.v + self.b1.v * 1j)
-        y2 = self.u.v * (self.g2.v + self.b2.v * 1j)
-        y12 = self.u.v / (self.r.v + self.x.v * 1j)
-        m = self.tap.v * np.exp(1j * self.phi.v)
-        m2 = self.tap.v**2
-        mconj = np.conj(m)
-
-        # build self and mutual admittances into Y
-        Y = spmatrix((y12 + y1 / m2), self.a1a, self.a1a, (nb, nb), 'z')
-        Y -= spmatrix(y12 / mconj, self.a1a, self.a2a, (nb, nb), 'z')
-        Y -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Y += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-
-        return Y
-
-    def build_Bp(self, method='fdpf'):
-        """
-        Function for building B' matrix.
-
-        Parameters
-        ----------
-        method : str
-            Method for building B' matrix. Choose from 'fdpf', 'fdbx', 'dcpf'.
-
-        Returns
-        -------
-        Bp : spmatrix
-            B' matrix.
-        """
-        nb = self.system.Bus.n
-
-        if method not in ("fdpf", "fdbx", "dcpf"):
-            raise ValueError(f"Invalid method {method}; choose from 'fdpf', 'fdbx', 'dcpf'")
-
-        # Build B prime matrix -- FDPF
-        # `y1`` neglects line charging shunt, and g1 is usually 0 in HV lines
-        # `y2`` neglects line charging shunt, and g2 is usually 0 in HV lines
-        y1 = self.u.v * self.g1.v
-        y2 = self.u.v * self.g2.v
-
-        # `m` neglected tap ratio
-        m = np.exp(self.phi.v * 1j)
-        mconj = np.conj(m)
-        m2 = np.ones(self.n)
-
-        if method in ('fdxb', 'dcpf'):
-            # neglect line resistance in Bp in XB method
-            y12 = self.u.v / (self.x.v * 1j)
-        else:
-            y12 = self.u.v / (self.r.v + self.x.v * 1j)
-
-        Bdc = spmatrix((y12 + y1) / m2, self.a1a, self.a1a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12 / mconj, self.a1a, self.a2a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Bdc += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-        Bdc = Bdc.imag()
-
-        for item in range(nb):
-            if abs(Bdc[item, item]) == 0:
-                Bdc[item, item] = 1e-6 + 0j
-
-        return Bdc
-
-    def build_Bpp(self, method='fdpf'):
-        """
-        Function for building B'' matrix.
-
-        Parameters
-        ----------
-        method : str
-            Method for building B'' matrix. Choose from 'fdpf', 'fdbx', 'dcpf'.
-
-        Returns
-        -------
-        Bpp : spmatrix
-            B'' matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        if method not in ("fdpf", "fdbx", "dcpf"):
-            raise ValueError(f"Invalid method {method}; choose from 'fdpf', 'fdbx', 'dcpf'")
-
-        # Build B double prime matrix
-        # y1 neglected line charging shunt, and g1 is usually 0 in HV lines
-        # y2 neglected line charging shunt, and g2 is usually 0 in HV lines
-        # m neglected phase shifter
-        y1 = self.u.v * (self.g1.v + self.b1.v * 1j)
-        y2 = self.u.v * (self.g2.v + self.b2.v * 1j)
-
-        m = self.tap.v
-        m2 = abs(m)**2
-
-        if method in ('fdbx', 'fdpf', 'dcpf'):
-            # neglect line resistance in Bpp in BX method
-            y12 = self.u.v / (self.x.v * 1j)
-        else:
-            y12 = self.u.v / (self.r.v + self.x.v * 1j)
-
-        Bpp = spmatrix((y12 + y1) / m2, self.a1a, self.a1a, (nb, nb), 'z')
-        Bpp -= spmatrix(y12 / np.conj(m), self.a1a, self.a2a, (nb, nb), 'z')
-        Bpp -= spmatrix(y12 / m, self.a2a, self.a1a, (nb, nb), 'z')
-        Bpp += spmatrix(y12 + y2, self.a2a, self.a2a, (nb, nb), 'z')
-        Bpp = Bpp.imag()
-
-        for item in range(nb):
-            if abs(Bpp[item, item]) == 0:
-                Bpp[item, item] = 1e-6 + 0j
-
-        return Bpp
-
-    def build_Bdc(self):
-        """
-        The MATPOWER-flavor Bdc matrix for DC power flow.
-
-        The method neglects line charging and line resistance. It retains tap ratio.
-
-        Returns
-        -------
-        Bdc : spmatrix
-            Bdc matrix.
-        """
-
-        nb = self.system.Bus.n
-
-        y12 = self.u.v / (self.x.v * 1j)
-        y12 = y12 / self.tap.v
-
-        Bdc = spmatrix(y12, self.a1a, self.a1a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12, self.a1a, self.a2a, (nb, nb), 'z')
-        Bdc -= spmatrix(y12, self.a2a, self.a1a, (nb, nb), 'z')
-        Bdc += spmatrix(y12, self.a2a, self.a2a, (nb, nb), 'z')
-        Bdc = Bdc.imag()
-
-        for item in range(nb):
-            if abs(Bdc[item, item]) == 0:
-                Bdc[item, item] = 1e-6
-
-        return Bdc
-
 
 class Jumper(JumperData, Model):
     """

ams/models/renewable/regc.py

@@ -2,7 +2,7 @@
 RenGen scheduling model.
 """
 
-from andes.core.param import NumParam, IdxParam, ExtParam
+from andes.core.param import NumParam, IdxParam
 from andes.core.model import ModelData
 from ams.core.model import Model
 
@@ -80,10 +80,6 @@ class REGCV1(REGCData, Model):
         REGCData.__init__(self)
         Model.__init__(self, system, config)
         self.group = 'VSG'
-        self.zone = ExtParam(model='Bus', src='zone',
-                             indexer=self.bus, export=False,
-                             info='Retrieved zone idx',
-                             vtype=str, default=None)
         self.M = NumParam(default=10, tex_name='M',
                           info='Inertia emulation',
                           unit='s',

ams/models/reserve.py

@@ -10,8 +10,8 @@ from ams.core.model import Model
 class ReserveData(ModelData):
     def __init__(self):
         super().__init__()
-        self.zone = IdxParam(model='Zone',
-                             default=None, info="Zone code",)
+        self.area = IdxParam(model='Area',
+                             default=None, info="Area idx",)
 
 
 class SFR(ReserveData, Model):

ams/models/static/gen.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from andes.core.param import NumParam, ExtParam
+from andes.core.param import NumParam, ExtParam, DataParam
 from andes.models.static.pv import PVData
 from andes.models.static.slack import SlackData
 
@@ -81,6 +81,14 @@ class GenParam:
                             tex_name=r't_{d2}',
                             unit='h',
                             )
+        self.gentype = DataParam(default=None,
+                                 info='generator type',
+                                 tex_name=r'g_{type}',
+                                 )
+        self.genfuel = DataParam(default=None,
+                                 info='generator fuel type',
+                                 tex_name=r'g_{fuel}',
+                                 )
 
 
 class PVModel(Model):
@@ -120,8 +128,8 @@ class PVModel(Model):
                               err_tol=r"\epsilon_{tol}"
                               )
 
-        self.zone = ExtParam(model='Bus', src='zone', indexer=self.bus, export=False,
-                             info='Retrieved zone idx', vtype=str, default=None,
+        self.area = ExtParam(model='Bus', src='area', indexer=self.bus, export=False,
+                             info='Retrieved area idx', vtype=str, default=None,
                              )
 
         self.ud = Algeb(info='commitment decision',

ams/models/static/pq.py

@@ -53,8 +53,8 @@ class PQ(PQData, Model):
                               q2z=r"\gamma_{q2z}",
                               )
 
-        self.zone = ExtParam(model='Bus', src='zone', indexer=self.bus, export=False,
-                             info='Retrieved zone idx', vtype=str, default=None,
+        self.area = ExtParam(model='Bus', src='area', indexer=self.bus, export=False,
+                             info='Retrieved area idx', vtype=str, default=None,
                              )
         self.ctrl = NumParam(default=1,
                              info="load controllability",

ams/models/timeslot.py

@@ -18,7 +18,7 @@ def str_list_oconv(x):
 
 class TimeSlot(ModelData, Model):
     """
-    Time slot data for rolling horizon.
+    Base model for time slot data used in multi-interval scheduling.
     """
 
     def __init__(self, system=None, config=None):

ams/routines/dcopf.py

@@ -152,7 +152,7 @@ class DCOPF(DCPFBase):
 
     def dc2ac(self, kloss=1.0, **kwargs):
         """
-        Convert the RTED results with ACOPF.
+        Convert the results using ACOPF.
 
         Parameters
         ----------

ams/routines/dcpf0.py

@@ -168,7 +168,7 @@ class DCPF0(RoutineBase):
         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)
+            logger.warning(msg)
             try:
                 self.unpack(res)
             except Exception as e:

ams/routines/dopf.py

@@ -16,11 +16,11 @@ class DOPF(DCOPF):
 
     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.
+    References
+    -----------------
+    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):
@@ -115,11 +115,11 @@ class DOPFVIS(DOPF):
 
     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.
+    References
+    -----------------
+    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):