ltbams 0.9.11__tar.gz → 0.9.12__tar.gz

ltbams-0.9.12/PKG-INFO

@@ -0,0 +1,173 @@
+Metadata-Version: 2.1
+Name: ltbams
+Version: 0.9.12
+Summary: Python software for scheduling modeling and co-simulation with dynanics.
+Home-page: https://github.com/CURENT/ams
+Author: Jinning Wang
+Author-email: jinninggm@gmail.com
+License: GNU Public License v3
+Platform: UNKNOWN
+Classifier: Development Status :: 4 - Beta
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Environment :: Console
+Description-Content-Type: text/markdown
+Provides-Extra: all
+Provides-Extra: coverage             
+Provides-Extra: dev
+Provides-Extra: doc
+Provides-Extra: flake8               
+Provides-Extra: ipython              
+Provides-Extra: myst-parser          
+Provides-Extra: nbsphinx             
+Provides-Extra: numpydoc             
+Provides-Extra: pandoc               
+Provides-Extra: pydata-sphinx-theme  
+Provides-Extra: pyscipopt            
+Provides-Extra: pytest               
+Provides-Extra: pytest-cov           
+Provides-Extra: sphinx               
+Provides-Extra: sphinx-copybutton    
+Provides-Extra: sphinx-panels        
+Provides-Extra: toml                 
+License-File: LICENSE
+
+# LTB AMS
+
+Python Software for Power System Scheduling Modeling and Co-Simulation with Dynanic, serving as the market simulator for the [CURENT Largescale Testbed][LTB Repository].
+
+[![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://github.com/CURENT/ams/blob/master/LICENSE)
+![platforms](https://anaconda.org/conda-forge/ltbams/badges/platforms.svg)
+[![Python Versions](https://img.shields.io/badge/Python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue)](https://www.python.org/)
+![Repo Size](https://img.shields.io/github/repo-size/CURENT/ams)
+[![GitHub last commit (master)](https://img.shields.io/github/last-commit/CURENT/ams/master?label=last%20commit%20to%20master)](https://github.com/CURENT/ams/commits/master/)
+[![GitHub last commit (develop)](https://img.shields.io/github/last-commit/CURENT/ams/develop?label=last%20commit%20to%20develop)](https://github.com/CURENT/ams/commits/develop/)
+[![libraries](https://img.shields.io/librariesio/release/pypi/ltbams)](https://libraries.io/pypi/ltbams)
+[![Structure](https://img.shields.io/badge/code_base-visualize-blue)](https://mango-dune-07a8b7110.1.azurestaticapps.net/?repo=CURENT%2Fams)
+
+<img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
+
+|               | Latest                                                                                                                                        | Stable                                                                                                                                        |
+|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| Documentation | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) |
+
+
+| Badges        |                                                                                                                                                                                                                                                     |                                                                                                                                                                                                            |
+|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Downloads     | [![PyPI Version](https://img.shields.io/pypi/v/ltbams.svg)](https://pypi.python.org/pypi/ltbams)         | [![Conda Version](https://anaconda.org/conda-forge/ltbams/badges/version.svg)](https://anaconda.org/conda-forge/ltbams) |
+| Try on Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/curent/ams/master)                                                                                                                                                 |                                                                                                                                                                                                            |
+| Code Quality  |[![Codacy Badge](https://app.codacy.com/project/badge/Grade/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)| [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage) |
+| Build Status  | [![GitHub Action Status](https://github.com/CURENT/ams/workflows/Python%20application/badge.svg)](https://github.com/curent/ams/actions)  | [![Build Status](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=master)](https://dev.azure.com/curentltb/ams/_build/latest?definitionId=2&branchName=master) |
+
+
+# Why AMS
+
+With the built-in interface with ANDES, AMS enables **Dynamics Incorporated**
+**Stability-Constrained Scheduling**.
+
+AMS is a **Modeling Framework** that provides a descriptive way to formulate
+scheduling problems. The optimization problems are then handled by **CVXPY**
+and solved with third-party solvers.
+
+AMS produces credible scheduling results and competitive performance.
+The following results show the comparison of DCOPF between AMS and other tools.
+
+| Cost [\$]       |      AMS       |  MATPOWER   | pandapower |
+|----------------:|--------------:|------------:|-----------:|
+| PEGASE 1354-Bus |  1,173,590.63  |  1,173,590.63 |  1,173,590.63 |
+| PEGASE 2869-Bus |  2,338,915.61  |  2,338,915.61 |  2,338,915.61 |
+| GOC 4020-Bus    |    793,634.11  |    793,634.11 |    793,634.11 |
+| EPIGRIDS 5658-Bus| 1,195,466.12  |  1,195,466.12 |  1,195,466.12 |
+| EPIGRIDS 7336-Bus| 1,855,870.94  |  1,855,870.94 |  1,855,870.94 |
+
+<img src="docs/source/images/dcopf_time.png" alt="DCOPF Time" width="400" height="auto">
+
+AMS is currently under active development.
+Use the following resources to get involved.
+
+-  Start from the [documentation][readthedocs] for installation and tutorial.
+-  Check out examples in the [examples folder][examples]
+-  Read the model verification results in the [examples/verification folder][verification]
+-  Ask a question in the [GitHub Discussions][Github Discussions]
+-  Report bugs or issues by submitting a [GitHub issue][GitHub issues]
+-  Submit contributions using [pull requests][GitHub pull requests]
+-  Read release notes highlighted [here][release notes]
+-  Try in Jupyter Notebook on [Binder][Binder]
+<!-- + Check out and and cite our [paper][arxiv paper] -->
+
+# Installation
+
+***NOTE:***
+- Version **0.9.9** has known issues and has been yanked from PyPI
+- `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
+- `cvxpy` versions **below 1.5** are incompatible with `numpy` versions **2.0 and above**
+
+AMS is released as ``ltbams`` on PyPI and conda-forge.
+Install from PyPI using pip:
+
+```bash
+pip install ltbams
+```
+
+Install from conda-forge using conda:
+
+```bash
+conda install conda-forge::ltbams
+```
+
+Install from GitHub source:
+
+```bash
+pip install git+https://github.com/CURENT/ams.git
+```
+
+# Example Usage
+
+Using AMS to run a Real-Time Economic Dispatch (RTED) simulation:
+
+```python
+import ams
+
+ss = ams.load(ams.get_case('ieee14_uced.xlsx'))
+ss.RTED.run()
+
+print(ss.RTED.pg.v)
+```
+
+# Sponsors and Contributors
+AMS is the scheduling simulation engine for the CURENT Largescale Testbed (LTB).
+More information about CURENT LTB can be found at the [LTB Repository][LTB Repository].
+
+This work was supported in part by the Engineering Research Center Program of the National Science Foundation and the Department of Energy
+under NSF Award Number EEC-1041877 and the CURENT Industry Partnership Program.
+
+This work was supported in part by the Advanced Grid Research and Development Program in the Office of Electricity at the U.S. Department of Energy.
+
+See [GitHub contributors][GitHub contributors] for the contributor list.
+
+# License
+AMS is licensed under the [GPL v3 License](./LICENSE).
+
+# Related Projects
+- [Popular Open Source Libraries for Power System Analysis](https://github.com/jinningwang/best-of-ps)
+- [G-PST Tools Portal](https://g-pst.github.io/tools/): An open tools portal with a classification approach
+- [Open Source Software (OSS) for Electricity Market Research, Teaching, and Training](https://www2.econ.iastate.edu/tesfatsi/ElectricOSS.htm)
+
+Some commercial solvers provide academic licenses, such as COPT, GUROBI, CPLEX, and MOSEK.
+
+* * *
+
+[GitHub releases]:       https://github.com/CURENT/ams/releases
+[GitHub issues]:         https://github.com/CURENT/ams/issues
+[Github Discussions]:    https://github.com/CURENT/ams/discussions
+[GitHub insights]:       https://github.com/CURENT/ams/pulse
+[GitHub pull requests]:  https://github.com/CURENT/ams/pulls
+[GitHub contributors]:   https://github.com/CURENT/ams/graphs/contributors
+[readthedocs]:           https://ams.readthedocs.io
+[release notes]:         https://ams.readthedocs.io/en/latest/release-notes.html
+[examples]:              https://github.com/CURENT/ams/tree/master/examples
+[verification]:          https://github.com/CURENT/ams/tree/master/examples/verification
+[Binder]:                https://mybinder.org/v2/gh/curent/ams/master
+[LTB Repository]:        https://github.com/CURENT
+

{ltbams-0.9.11 → ltbams-0.9.12}/README.md

@@ -28,7 +28,12 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
 
 # Why AMS
 
-With the built-in interface with dynamic simulation engine, ANDES, AMS enables Dynamics Interfaced Stability Constrained Production Cost and Market Operation Modeling.
+With the built-in interface with ANDES, AMS enables **Dynamics Incorporated**
+**Stability-Constrained Scheduling**.
+
+AMS is a **Modeling Framework** that provides a descriptive way to formulate
+scheduling problems. The optimization problems are then handled by **CVXPY**
+and solved with third-party solvers.
 
 AMS produces credible scheduling results and competitive performance.
 The following results show the comparison of DCOPF between AMS and other tools.
@@ -59,7 +64,7 @@ Use the following resources to get involved.
 # Installation
 
 ***NOTE:***
-- Version **0.9.9** has known issues. Please avoid using this version
+- Version **0.9.9** has known issues and has been yanked from PyPI
 - `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
 - `cvxpy` versions **below 1.5** are incompatible with `numpy` versions **2.0 and above**
 

{ltbams-0.9.11 → ltbams-0.9.12}/ams/__init__.py

@@ -1,6 +1,7 @@
 from . import _version
 __version__ = _version.get_versions()['version']
 
+from ams import opt  # NOQA
 from ams import benchmarks  # NOQA
 
 from ams.main import config_logger, load, run  # NOQA
@@ -10,4 +11,4 @@ from ams.shared import ppc2df  # NOQA
 
 __author__ = 'Jining Wang'
 
-__all__ = ['System', 'get_case', 'System']
+__all__ = ['System', 'get_case']

{ltbams-0.9.11 → ltbams-0.9.12}/ams/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-14T16:34:57-0500",
+ "date": "2024-11-23T17:09:40-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "9dcd290dc6532149fcd0b4f26fb5e9af4bf4bf36",
- "version": "0.9.11"
+ "full-revisionid": "377b36f113e1e88f8c2d21d3c6ab8ff3728cffb0",
+ "version": "0.9.12"
 }
 '''  # END VERSION_JSON
 

{ltbams-0.9.11 → ltbams-0.9.12}/ams/core/documenter.py

@@ -223,9 +223,10 @@ class RDocumenter:
         # add tables
         self.parent.syms.generate_symbols()
         out += self._obj_doc(max_width=max_width, export=export)
-        out += self._constr_doc(max_width=max_width, export=export)
         out += self._expr_doc(max_width=max_width, export=export)
+        out += self._constr_doc(max_width=max_width, export=export)
         out += self._var_doc(max_width=max_width, export=export)
+        out += self._exprc_doc(max_width=max_width, export=export)
         out += self._service_doc(max_width=max_width, export=export)
         out += self._param_doc(max_width=max_width, export=export)
         out += self.config.doc(max_width=max_width, export=export)
@@ -316,17 +317,26 @@ class RDocumenter:
                               rest_dict=rest_dict)
 
     def _expr_doc(self, max_width=78, export='plain'):
-        # expression documentation
+        # Expression documentation
         if len(self.parent.exprs) == 0:
             return ''
 
         # prepare temporary lists
-        names, var_names, info = list(), list(), list()
+        names, info = list(), list()
+        units, sources, units_rest = list(), list(), list()
 
         for p in self.parent.exprs.values():
             names.append(p.name)
-            var_names.append(p.var)
             info.append(p.info if p.info else '')
+            units.append(p.unit if p.unit else '')
+            units_rest.append(f'*{p.unit}*' if p.unit else '')
+
+            slist = []
+            if p.owner is not None and p.src is not None:
+                slist.append(f'{p.owner.class_name}.{p.src}')
+            elif p.owner is not None and p.src is None:
+                slist.append(f'{p.owner.class_name}')
+            sources.append(','.join(slist))
 
         # expressions based on output format
         expressions = []
@@ -342,13 +352,67 @@ class RDocumenter:
         expressions = math_wrap(expressions, export=export)
 
         plain_dict = OrderedDict([('Name', names),
-                                  ('Variable', var_names),
                                   ('Description', info),
+                                  ('Unit', units),
+                                  ])
+        rest_dict = OrderedDict([('Name', names),
+                                 ('Description', info),
+                                 ('Expression', expressions),
+                                 ('Unit', units_rest),
+                                 ('Source', sources),
+                                 ])
+
+        # convert to rows and export as table
+        return make_doc_table(title=title,
+                              max_width=max_width,
+                              export=export,
+                              plain_dict=plain_dict,
+                              rest_dict=rest_dict)
+
+    def _exprc_doc(self, max_width=78, export='plain'):
+        # ExpressionCalc documentation
+        if len(self.parent.exprcs) == 0:
+            return ''
+
+        # prepare temporary lists
+        names, info = list(), list()
+        units, sources, units_rest = list(), list(), list()
+
+        for p in self.parent.exprcs.values():
+            names.append(p.name)
+            info.append(p.info if p.info else '')
+            units.append(p.unit if p.unit else '')
+            units_rest.append(f'*{p.unit}*' if p.unit else '')
+
+            slist = []
+            if p.owner is not None and p.src is not None:
+                slist.append(f'{p.owner.class_name}.{p.src}')
+            elif p.owner is not None and p.src is None:
+                slist.append(f'{p.owner.class_name}')
+            sources.append(','.join(slist))
+
+        # expressions based on output format
+        expressions = []
+        if export == 'rest':
+            for p in self.parent.exprcs.values():
+                expr = _tex_pre(self, p, self.parent.syms.tex_map)
+                logger.debug(f'{p.name} math: {expr}')
+                expressions.append(expr)
+
+            title = 'ExpressionCalcs\n----------------------------------'
+        else:
+            title = 'ExpressionCalcs'
+        expressions = math_wrap(expressions, export=export)
+
+        plain_dict = OrderedDict([('Name', names),
+                                  ('Description', info),
+                                  ('Unit', units),
                                   ])
         rest_dict = OrderedDict([('Name', names),
-                                 ('Variable', var_names),
                                  ('Description', info),
                                  ('Expression', expressions),
+                                 ('Unit', units_rest),
+                                 ('Source', sources),
                                  ])
 
         # convert to rows and export as table
@@ -423,6 +487,8 @@ class RDocumenter:
             slist = []
             if p.owner is not None and p.src is not None:
                 slist.append(f'{p.owner.class_name}.{p.src}')
+            elif p.owner is not None and p.src is None:
+                slist.append(f'{p.owner.class_name}')
             sources.append(','.join(slist))
 
         # symbols based on output format
@@ -490,6 +556,8 @@ class RDocumenter:
             slist = []
             if p.owner is not None and p.src is not None:
                 slist.append(f'{p.owner.class_name}.{p.src}')
+            elif p.owner is not None and p.src is None:
+                slist.append(f'{p.owner.class_name}')
             sources.append(','.join(slist))
 
         # symbols based on output format

{ltbams-0.9.11 → ltbams-0.9.12}/ams/core/matprocessor.py

@@ -13,7 +13,7 @@ from andes.thirdparty.npfunc import safe_div
 from andes.shared import tqdm, tqdm_nb
 from andes.utils.misc import elapsed, is_notebook
 
-from ams.opt.omodel import Param
+from ams.opt import Param
 from ams.shared import pd, sps
 
 logger = logging.getLogger(__name__)
@@ -140,7 +140,9 @@ class MParam(Param):
 
 class MatProcessor:
     """
-    Class for matrix processing in AMS system.
+    Class for matrices processing in AMS system.
+    The connectivity matrices `Cft`, `Cg`, `Cl`, and `Csh` ***have taken*** the
+    devices connectivity into account.
 
     The MParams' row names and col names are assigned in `System.setup()`.
     """

{ltbams-0.9.11 → ltbams-0.9.12}/ams/core/param.py

@@ -10,7 +10,7 @@ from typing import Optional, Iterable
 import numpy as np
 from scipy.sparse import issparse
 
-from ams.opt.omodel import Param
+from ams.opt import Param
 
 logger = logging.getLogger(__name__)
 

{ltbams-0.9.11 → ltbams-0.9.12}/ams/core/service.py

@@ -10,7 +10,7 @@ import scipy.sparse as spr
 
 from andes.core.service import BaseService
 
-from ams.opt.omodel import Param
+from ams.opt import Param
 
 
 logger = logging.getLogger(__name__)
@@ -33,8 +33,6 @@ class RBaseService(BaseService, Param):
         Description.
     vtype : Type, optional
         Variable type.
-    model : str, optional
-        Model name.
     no_parse: bool, optional
         True to skip parsing the service.
     sparse: bool, optional
@@ -106,8 +104,8 @@ class ValueService(RBaseService):
         Description.
     vtype : Type, optional
         Variable type.
-    model : str, optional
-        Model name.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -155,8 +153,8 @@ class ROperationService(RBaseService):
         Description.
     vtype : Type, optional
         Variable type.
-    model : str, optional
-        Model name.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -194,6 +192,8 @@ class LoadScale(ROperationService):
         Unit.
     info : str, optional
         Description.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -236,7 +236,7 @@ class NumOp(ROperationService):
 
     Note that the scalar output is converted to a 1D array.
 
-    The optional kwargs are passed to the input function.
+    The `rargs` are passed to the input function.
 
     Parameters
     ----------
@@ -397,8 +397,6 @@ class NumOpDual(NumOp):
         Description.
     vtype : Type, optional
         Variable type.
-    model : str, optional
-        Model name.
     rfun : Callable, optional
         Function to apply to the output of ``fun``.
     rargs : dict, optional
@@ -407,6 +405,8 @@ class NumOpDual(NumOp):
         Expand the dimensions of the output array along a specified axis.
     array_out : bool, optional
         Whether to force the output to be an array.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -467,6 +467,10 @@ class MinDur(NumOpDual):
         Unit.
     info : str, optional
         Description.
+    vtype : Type, optional
+        Variable type.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -537,8 +541,12 @@ class NumHstack(NumOp):
         Description.
     vtype : Type, optional
         Variable type.
-    model : str, optional
-        Model name.
+    rfun : Callable, optional
+        Function to apply to the output of ``fun``.
+    rargs : dict, optional
+        Keyword arguments to pass to ``rfun``.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -624,8 +632,12 @@ class ZonalSum(NumOp):
         Description.
     vtype : Type
         Variable type.
-    model : str
-        Model name.
+    rfun : Callable, optional
+        Function to apply to the output of ``fun``.
+    rargs : dict, optional
+        Keyword arguments to pass to ``rfun``.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -676,7 +688,7 @@ class VarSelect(NumOp):
     A numerical matrix to select a subset of a 2D variable,
     ``u.v[:, idx]``.
 
-    For example, if nned to select Energy Storage output
+    For example, if need to select Energy Storage output
     power from StaticGen `pg`, following definition can be used:
     ```python
     class RTED:
@@ -709,6 +721,8 @@ class VarSelect(NumOp):
         Keyword arguments to pass to ``rfun``.
     array_out : bool, optional
         Whether to force the output to be an array.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -790,7 +804,7 @@ class VarReduction(NumOp):
     u : Callable
         The input matrix variable.
     fun : Callable
-        The reduction function that takes a shape parameter (1D shape) as input.
+        The reduction function that takes a shape argument (1D shape) as input.
     name : str, optional
         The name of the instance.
     tex_name : str, optional
@@ -801,8 +815,12 @@ class VarReduction(NumOp):
         A description of the operation.
     vtype : Type, optional
         The variable type.
-    model : str, optional
-        The model name associated with the operation.
+    rfun : Callable, optional
+        Function to apply to the output of ``fun``.
+    rargs : dict, optional
+        Keyword arguments to pass to ``rfun``.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """
@@ -818,13 +836,11 @@ class VarReduction(NumOp):
                  rfun: Callable = None,
                  rargs: dict = None,
                  no_parse: bool = False,
-                 sparse: bool = False,
-                 **kwargs):
+                 sparse: bool = False,):
         super().__init__(name=name, tex_name=tex_name, unit=unit,
                          info=info, vtype=vtype,
                          u=u, fun=None, rfun=rfun, rargs=rargs,
-                         no_parse=no_parse, sparse=sparse,
-                         **kwargs)
+                         no_parse=no_parse, sparse=sparse,)
         self.fun = fun
 
     @property
@@ -859,8 +875,12 @@ class RampSub(NumOp):
         Description.
     vtype : Type
         Variable type.
-    model : str
-        Model name.
+    rfun : Callable, optional
+        Function to apply to the output of ``fun``.
+    rargs : dict, optional
+        Keyword arguments to pass to ``rfun``.
+    no_parse: bool, optional
+        True to skip parsing the service.
     sparse: bool, optional
         True to return output as scipy csr_matrix.
     """

{ltbams-0.9.11 → ltbams-0.9.12}/ams/core/symprocessor.py

@@ -89,6 +89,9 @@ class SymProcessor:
             (r'(== 0|<= 0)$', ''),  # remove the comparison operator
             (r'cp\.(Minimize|Maximize)', r'float'),  # remove cp.Minimize/Maximize
             (r'\bcp.\b', 'np.'),
+            (r'\bexp\b', 'np.exp'),
+            (r'\blog\b', 'np.log'),
+            (r'\bconj\b', 'np.conj'),
         ])
 
         self.status = {
@@ -124,9 +127,7 @@ class SymProcessor:
 
         # Vars
         for vname, var in self.parent.vars.items():
-            tmp = sp.symbols(f'{var.name}')
-            # tmp = sp.symbols(var.name)
-            self.inputs_dict[vname] = tmp
+            self.inputs_dict[vname] = sp.symbols(f'{vname}')
             self.sub_map[rf"\b{vname}\b"] = f"self.om.{vname}"
             self.tex_map[rf"\b{vname}\b"] = rf'{var.tex_name}'
             self.val_map[rf"\b{vname}\b"] = f"rtn.{vname}.v"
@@ -163,6 +164,13 @@ class SymProcessor:
             if not service.no_parse:
                 self.val_map[rf"\b{sname}\b"] = f"rtn.{sname}.v"
 
+        # Expressions
+        for ename, expr in self.parent.exprs.items():
+            self.inputs_dict[ename] = sp.symbols(f'{ename}')
+            self.sub_map[rf"\b{ename}\b"] = f"self.om.{ename}"
+            self.val_map[rf"\b{ename}\b"] = f"rtn.{ename}.v"
+            self.tex_map[rf"\b{ename}\b"] = f'{expr.tex_name}'
+
         # Constraints
         # NOTE: constraints are included in sub_map for ExpressionCalc
         # thus, they don't have the suffix `.v`