Skip to content

Commit 8dcd2c3

Browse files
authored
Merge pull request #348 from DiODeProject/sympy_latex_parsing
Replace latex2sympy's process_sympy with sympy's parse_latex
2 parents 1679c57 + ef088fd commit 8dcd2c3

17 files changed

Lines changed: 37 additions & 4631 deletions

docs/source/about.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ under the European Union's `Horizon 2020`_ research and innovation programme
4141
Included third-party code
4242
^^^^^^^^^^^^^^^^^^^^^^^^^
4343

44-
* ``mumot/process_latex/``: LaTeX parser; taken from latex2sympy project and updated for Python 3. (C) latex2sympy, under the MIT license.
45-
* ``mumot/gen``: includes submodules used by MuMoT
4644
* ``mumot/__init__.py``: contains functions (C) 2012 Free Software Foundation, under the MIT Licence
4745

4846
mybinder.org

mumot/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
if sys.platform == "darwin":
2424
matplotlib.use('TkAgg')
2525
from matplotlib import pyplot as plt
26+
from sympy.parsing.latex import parse_latex
2627

2728
# Import the functions and classes we wish to export i.e. the public API
2829
from ._version import __version__
29-
from .process_latex.process_latex import process_sympy
3030
from .models import (
3131
MuMoTmodel,
3232
parseModel,

mumot/consts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
from enum import Enum
44

5-
from .process_latex.process_latex import process_sympy
5+
from sympy.parsing.latex import parse_latex
66

77
MAX_RANDOM_SEED = 2147483647
88

9-
EMPTYSET_SYMBOL = process_sympy('1')
9+
EMPTYSET_SYMBOL = parse_latex('1')
1010

1111
GREEK_LETT_LIST_1 = ['alpha', 'beta', 'gamma', 'Gamma', 'delta', 'Delta',
1212
'epsilon', 'zeta', 'theta', 'Theta', 'iota', 'kappa',

mumot/gen/PS.tokens

Lines changed: 0 additions & 108 deletions
This file was deleted.

mumot/gen/PSLexer.py

Lines changed: 0 additions & 333 deletions
This file was deleted.

mumot/gen/PSLexer.tokens

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)