Merge pull request #153 from dynamicslab/weak_optimization

Enhanced subdomain integration for the weak form library

Author: akaptano

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
   hooks:
     - id: reorder-python-imports
 - repo: https://github.com/ambv/black
-  rev: 21.5b1
+  rev: 22.3.0
   hooks:
     - id: black
 - repo: https://gitlab.com/pycqa/flake8

examples/12_weakform_SINDy_examples.ipynb

@@ -327,6 +327,11 @@ def __init__(
         )
         self.libraries_ = libraries
         self.inputs_per_library_ = inputs_per_library
+        for lib in self.libraries_:
+            if hasattr(lib, "spatiotemporal_grid"):
+                if lib.spatiotemporal_grid is not None:
+                    self.n_samples = lib.K
+                    self.spatiotemporal_grid = lib.spatiotemporal_grid
 
     def _combinations(self, lib_i, lib_j):
         """
@@ -422,9 +427,12 @@ def transform(self, x):
             generated from applying the custom functions to the inputs.
 
         """
+        n_samples = x.shape[0]
         for lib in self.libraries_:
             check_is_fitted(lib)
-        n_samples = x.shape[0]
+            if hasattr(lib, "spatiotemporal_grid"):
+                if lib.spatiotemporal_grid is not None:  # check if weak form
+                    n_samples = self.n_samples
 
         # preallocate matrix
         xp = np.zeros((n_samples, self.n_output_features_))

examples/1_feature_overview.ipynb

@@ -252,6 +252,9 @@ def transform(self, x):
 
         n_samples, n_features = x.shape
 
+        if isinstance(self.libraries_[0], WeakPDELibrary):
+            n_samples = self.libraries_[0].K * self.libraries_[0].num_trajectories
+
         if float(__version__[:3]) >= 1.0:
             n_input_features = self.n_features_in_
         else: