fixed bug#315 with the feature name order for the pdelibrary and weak…

…pdelibrary, replaced the nonlinear diffusion example in notebook 12 with a more extensive example on compressible flow, and fixed a small typo in notebook 10
dynamicslab · Apr 25, 2023 · f83bf20 · f83bf20
1 parent a24f943
commit f83bf20
Show file tree

Hide file tree

Showing 4 changed files with 333 additions and 244 deletions.
diff --git a/examples/10_PDEFIND_examples.ipynb b/examples/10_PDEFIND_examples.ipynb
diff --git a/examples/12_weakform_SINDy_examples.ipynb b/examples/12_weakform_SINDy_examples.ipynb
diff --git a/pysindy/feature_library/pde_library.py b/pysindy/feature_library/pde_library.py
@@ -282,11 +282,12 @@ def get_feature_names(self, input_features=None):
             feature_names.append("1")
 
         # Include any non-derivative terms
+        function_feature_names = []
         for i, f in enumerate(self.functions):
             for c in self._combinations(
                 n_features, f.__code__.co_argcount, self.interaction_only
             ):
-                feature_names.append(
+                function_feature_names.append(
                     self.function_names[i](*[input_features[j] for j in c])
                 )
 
@@ -308,27 +309,27 @@ def derivative_string(multiindex):
             return ret
 
         # Include derivative terms
+        derivative_feature_names = []
         for k in range(self.num_derivatives):
             for j in range(n_features):
-                feature_names.append(
+                derivative_feature_names.append(
                     input_features[j] + "_" + derivative_string(self.multiindices[k])
                 )
+        feature_names = feature_names + function_feature_names
+        feature_names = feature_names + derivative_feature_names
+
         # Include mixed non-derivative + derivative terms
         if self.include_interaction:
-            for k in range(self.num_derivatives):
-                for i, f in enumerate(self.functions):
-                    for c in self._combinations(
-                        n_features,
-                        f.__code__.co_argcount,
-                        self.interaction_only,
-                    ):
-                        for jj in range(n_features):
-                            feature_names.append(
-                                self.function_names[i](*[input_features[j] for j in c])
-                                + input_features[jj]
-                                + "_"
-                                + derivative_string(self.multiindices[k])
-                            )
+            feature_names = (
+                feature_names
+                + np.char.add(
+                    np.array(function_feature_names).reshape(1, -1),
+                    np.array(derivative_feature_names).reshape(-1, 1),
+                )
+                .reshape(-1)
+                .tolist()
+            )
+
         return feature_names
 
     @x_sequence_or_item

diff --git a/pysindy/feature_library/weak_pde_library.py b/pysindy/feature_library/weak_pde_library.py
@@ -762,13 +762,13 @@ def derivative_string(multiindex):
             # Include mixed non-derivative + integral terms
             if self.include_interaction:
                 for k in range(self.num_derivatives):
-                    for i, f in enumerate(self.functions):
-                        for c in self._combinations(
-                            n_features,
-                            f.__code__.co_argcount,
-                            self.interaction_only,
-                        ):
-                            for jj in range(n_features):
+                    for jj in range(n_features):
+                        for i, f in enumerate(self.functions):
+                            for c in self._combinations(
+                                n_features,
+                                f.__code__.co_argcount,
+                                self.interaction_only,
+                            ):
                                 feature_names.append(
                                     self.function_names[i](
                                         *[input_features[j] for j in c]