Merge branch 'main' into bug/kuramoto-demo

.github/workflows/python-testing.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11']
+        python-version: ['3.10'] #3.11
         os: [ubuntu-latest, macOS-latest] #,windows-latest]
     steps:
     - uses: actions/checkout@v3
@@ -24,12 +24,12 @@ jobs:
     - name: Setup PDM
       uses: pdm-project/[email protected]
       with: 
-        version: 2.10.4
+        version: 2.15.4
         cache: true
 
     - name: Install dependencies
       run: |
-        pdm install -d -G tensorflow -G rebound
+        pdm install -G all
     - name: Analysing the code with pylint
       run: |
         pdm run pylint $(git ls-files '*.py')

CONTRIBUTING.md

@@ -39,7 +39,7 @@
        pyenv shell 3.10.14   #use the newly installed version
        ```
 
-   Check your installation by running `which python` which should output something along the lines of:
+   Check your installation by running `which python`. Output should be along the lines of:
    - for mise: `/Users/[user]/.local/share/mise/installs/python/3.10.14/bin/python`
 
    - for pyenv: `/Users/[user]/.pyenv/shims/python`
@@ -53,11 +53,8 @@
       Installing via `mise` will allow for the flexibilty to change `pdm` versions depending on the project.
 
       ```sh
-       mise plugin install pdm
-       pip install virtualenv # might be necessary
-       mise install pdm 2.15.4
-       mise global pdm 2.15.4
-       ```
+       mise use --global [email protected]
+      ```
    2. For macOS, **with brew**:
 
        ```sh

src/dynadojo/baselines/dnn.py

@@ -170,8 +170,9 @@ class DNN(TorchBaseClass):
     def __init__(self, 
             embed_dim,
             timesteps,
+            max_control_cost,
             **kwargs):
-        super().__init__(embed_dim, timesteps, **kwargs)
+        super().__init__(embed_dim, timesteps, max_control_cost, **kwargs)
         self.model = torch.nn.Sequential(
             torch.nn.Linear(self.embed_dim, embed_dim*10),
             torch.nn.ReLU(),

tests/test_deterministic.py

@@ -15,15 +15,15 @@
 # baselines
 from dynadojo.baselines.aug_ode import AugODE
 from dynadojo.baselines.cnn import CNN
-from dynadojo.baselines.dmd import DMD
+# from dynadojo.baselines.dmd import DMD
 from dynadojo.baselines.dnn import DNN
 from dynadojo.baselines.ode import ODE
 # from dynadojo.baselines.sindy import SINDy
 
 ALL_BASELINES = [
     # AugODE,
     # CNN,
-    DMD,
+    # DMD,
     DNN,
     # ODE,
     # SINDy