pymoca 0.9.0__tar.gz → 0.9.2.dev0__tar.gz

{pymoca-0.9.0 → pymoca-0.9.2.dev0}/MANIFEST.in

@@ -2,7 +2,6 @@ include LICENSE
 include README.md
 recursive-include doc *
 recursive-include java *
-include versioneer.py
 include src/pymoca/_version.py
 include src/pymoca/Modelica.g4
 include src/pymoca/backends/xml/ModelicaXML/schemas/*.xsd

pymoca-0.9.2.dev0/PKG-INFO

@@ -0,0 +1,128 @@
+Metadata-Version: 2.2
+Name: pymoca
+Version: 0.9.2.dev0
+Summary: A Modelica to computer algebra system (CAS) translator.
+Author: Pymoca Contributors
+Maintainer-email: Jack Vreeken <jack@vreeken.me>, Kent Rutan <gs1150e@icloud.com>
+License: Copyright (c) 2016-2021, James Goppert and the Pymoca contributors.
+        All rights reserved.
+        
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions are met:
+        
+        * Redistributions of source code must retain the above copyright notice, this
+          list of conditions and the following disclaimer.
+        
+        * Redistributions in binary form must reproduce the above copyright notice,
+          this list of conditions and the following disclaimer in the documentation
+          and/or other materials provided with the distribution.
+        
+        * Neither the name of pymoca nor the names of its
+          contributors may be used to endorse or promote products derived from
+          this software without specific prior written permission.
+        
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        
+        
+Project-URL: homepage, https://github.com/pymoca/pymoca
+Keywords: modelica,simulation,compiler
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Other
+Classifier: Topic :: Software Development
+Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
+Classifier: Topic :: Scientific/Engineering :: Mathematics
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Scientific/Engineering :: Visualization
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Unix
+Classifier: Operating System :: MacOS
+Classifier: Topic :: Software Development :: Code Generators
+Classifier: Topic :: Software Development :: Compilers
+Classifier: Topic :: Software Development :: Embedded Systems
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy>=1.8.2
+Requires-Dist: antlr4-python3-runtime==4.13.*
+Provides-Extra: casadi
+Requires-Dist: casadi>=3.4.0; extra == "casadi"
+Requires-Dist: setuptools>=60.0.0; extra == "casadi"
+Provides-Extra: lxml
+Requires-Dist: lxml>=3.5.0; extra == "lxml"
+Requires-Dist: scipy>=0.13.3; extra == "lxml"
+Provides-Extra: sympy
+Requires-Dist: sympy>=0.7.6.1; extra == "sympy"
+Requires-Dist: scipy>=0.13.3; extra == "sympy"
+Requires-Dist: jinja2>=2.10.1; extra == "sympy"
+Provides-Extra: examples
+Requires-Dist: jupyterlab; extra == "examples"
+Requires-Dist: matplotlib; extra == "examples"
+Requires-Dist: control<=0.10.0,>=0.9.3.post2; extra == "examples"
+Provides-Extra: all
+Requires-Dist: pymoca[casadi,examples,lxml,sympy]; extra == "all"
+
+# <img alt="Pymoca" src="branding/icons/pymocalogo.svg" height="60">
+
+A Modelica to computer algebra system (CAS) compiler written in python.
+
+
+[![CI](https://github.com/pymoca/pymoca/workflows/CI/badge.svg)](https://github.com/pymoca/pymoca/actions?query=workflow%3ACI)
+[![Coverage](https://codecov.io/gh/pymoca/pymoca/branch/master/graph/badge.svg)](https://codecov.io/gh/pymoca/pymoca)
+[![DOI](https://zenodo.org/badge/20664755.svg)](https://zenodo.org/badge/latestdoi/20664755)
+
+
+## Install
+
+Python / PyPI:
+
+```bash
+pip install pymoca
+```
+
+Anaconda / Conda:
+1. Install anaconda 3.
+
+2. Setup environment.
+
+```bash
+./create_conda_env.sh enduser
+. activate pymoca
+jupyter notebook
+```
+
+## Examples
+* [Sympy Example](test/notebooks/Spring.ipynb)
+* [Casadi Example](test/notebooks/Casadi.ipynb)
+* [ModelicaXML Example](test/notebooks/XML.ipynb)
+
+## Roadmap
+
+### Completed Tasks
+
+* Parsing Modelica
+* Sympy Simulation/CAS creation for simple models
+* Casadi CAS creation for simple models
+
+### TODO
+
+* Gather requirements and unify Casadi model
+* Lazy parsing for reading large libraries
+* Support more of Modelica language elements
+
+<!--- vim:ts=4:sw=4:expandtab:
+!-->

pymoca-0.9.2.dev0/pyproject.toml

@@ -0,0 +1,66 @@
+[build-system]
+requires = ["setuptools", "versioneer[toml]==0.29"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pymoca"
+dynamic = ["version"]
+license = { file = "LICENSE" }
+description = "A Modelica to computer algebra system (CAS) translator."
+keywords = ["modelica", "simulation", "compiler"]
+readme = "README.md"
+authors = [{ name = "Pymoca Contributors" }]
+maintainers = [
+    { name = "Jack Vreeken", email = "jack@vreeken.me" },
+    { name = "Kent Rutan", email = "gs1150e@icloud.com" },
+]
+requires-python = ">=3.9"
+dependencies = ["numpy >= 1.8.2", "antlr4-python3-runtime == 4.13.*"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Other",
+    "Topic :: Software Development",
+    "Topic :: Scientific/Engineering :: Artificial Intelligence",
+    "Topic :: Scientific/Engineering :: Mathematics",
+    "Topic :: Scientific/Engineering :: Physics",
+    "Topic :: Scientific/Engineering :: Visualization",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+    "Operating System :: MacOS",
+    "Topic :: Software Development :: Code Generators",
+    "Topic :: Software Development :: Compilers",
+    "Topic :: Software Development :: Embedded Systems",
+]
+
+[project.urls]
+homepage = "https://github.com/pymoca/pymoca"
+
+[project.optional-dependencies]
+# Note that we need setuptools for the distutils.ccompiler dependency
+# in the CasADi backend.
+casadi = ["casadi>=3.4.0", "setuptools>=60.0.0"]
+lxml = ["lxml>=3.5.0", "scipy>=0.13.3"]
+sympy = ["sympy>=0.7.6.1", "scipy>=0.13.3", "jinja2>=2.10.1"]
+examples = ["jupyterlab", "matplotlib", "control>=0.9.3.post2,<=0.10.0"]
+all = ["pymoca[casadi,lxml,sympy,examples]"]
+
+# TODO: Uncomment this when moving away from versioneer.
+# [tool.setuptools.dynamic]
+# version = { attr = "pymoca.__version__" }
+
+# See the docstring in versioneer.py for instructions. Note that after changing
+# this section, run `versioneer install --no-vendor`, commit the results.
+
+[tool.versioneer]
+VCS = "git"
+style = "pep440"
+versionfile_source = "src/pymoca/_version.py"
+versionfile_build = "pymoca/_version.py"
+tag_prefix = ""
+parentdir_prefix = "pymoca-"

{pymoca-0.9.0 → pymoca-0.9.2.dev0}/setup.cfg

@@ -1,14 +1,6 @@
 [metadata]
 license_file = LICENSE
 
-[versioneer]
-vcs = git
-style = pep440
-versionfile_source = src/pymoca/_version.py
-versionfile_build = pymoca/_version.py
-tag_prefix = 
-parentdir_prefix = pymoca-
-
 [flake8]
 max-line-length = 99
 exclude = 
@@ -31,6 +23,7 @@ exclude =
 	src/pymoca/backends/casadi/alias_relation.py,
 	src/pymoca/backends/sympy/generator.py,
 	src/pymoca/backends/sympy/runtime.py,
+	src/pymoca/backends/xml/generator.py,
 	src/pymoca/tree.py,
 	src/pymoca/ast.py,
 	src/pymoca/ast.py,

pymoca-0.9.2.dev0/setup.py

@@ -0,0 +1,11 @@
+
+"""Minimal setup file for versioneer."""
+
+from setuptools import setup
+
+import versioneer
+
+setup(
+    version=versioneer.get_version(),
+    cmdclass=versioneer.get_cmdclass(),
+)

pymoca-0.9.2.dev0/src/pymoca/__init__.py

@@ -0,0 +1,2 @@
+from . import _version
+__version__ = _version.get_versions()['version']

{pymoca-0.9.0 → pymoca-0.9.2.dev0}/src/pymoca/_version.py

@@ -1,5 +1,5 @@
 
-# This file was generated by 'versioneer.py' (0.18) from
+# This file was generated by 'versioneer.py' (0.29) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2021-06-18T17:32:21+0200",
+ "date": "2025-01-10T23:53:24+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "708deca2dc556d99b795b4956a84a5f94fbfe481",
- "version": "0.9.0"
+ "full-revisionid": "ae3e226fc72a8db2e7e4a847b2c5d5a89faf08b1",
+ "version": "0.9.2.dev0"
 }
 '''  # END VERSION_JSON
 

{pymoca-0.9.0 → pymoca-0.9.2.dev0}/src/pymoca/backends/casadi/api.py

@@ -1,3 +1,4 @@
+import itertools
 from collections import namedtuple
 from enum import IntEnum
 from typing import Dict
@@ -139,8 +140,10 @@ def _codegen_model(model_folder: str, f: ca.Function, library_name: str):
         compiler_flags = ['-O2', '-fPIC']
         linker_flags = ['-fPIC']
     else:
-        compiler_flags = ['/O2', '/wd4101']  # Shut up unused local variable warnings.
-        linker_flags = ['/DLL']
+        # Shut up unused local variable warnings, and use workaround for
+        # NaN-constantness bug in recent Windows SDK versions.
+        compiler_flags = ["/O2", "/wd4101", "/D_UCRT_NOISY_NAN"]
+        linker_flags = ["/DLL"]
 
     # Generate C code
     logger.debug("Generating {}".format(library_name))
@@ -260,6 +263,8 @@ def save_model(model_folder: str, model_name: str, model: Model,
 
             duration_dependencies = []
             for dur in durations:
+                if not isinstance(dur, ca.MX):
+                    dur = ca.MX(dur)  # Probably a constant, will have no dependencies
                 duration_dependencies.append(
                     [symbol_to_index[var] for var in ca.symvar(dur) if ca.depends_on(dur, var)])
             db['__delay_duration_dependent'] = duration_dependencies
@@ -414,7 +419,7 @@ def load_model(model_folder: str, model_name: str, compiler_options: Dict[str, s
             # Get rid of false dependency symbols not used in any delay
             # durations. This significantly reduces the work the (slow)
             # substitute() calls have to do later on.
-            actual_deps = sorted(set(np.array(duration_dependencies).ravel()))
+            actual_deps = sorted(set(itertools.chain(*duration_dependencies)))
 
             actual_dep_symbols = [np.nan] * len(all_symbols)
             for i in actual_deps: