Merge branch 'tutorial' into release/v1.7

nasa · Nov 5, 2024 · a828762 · a828762
2 parents 632e201 + 061322d
commit a828762
Show file tree

Hide file tree

Showing 8 changed files with 1,976 additions and 31 deletions.
diff --git a/examples/06_Combining Models.ipynb b/examples/06_Combining Models.ipynb
@@ -14,7 +14,7 @@
     "This section demonstrates how prognostic models can be combined. There are two times in which this is useful: \n",
     "\n",
     "1. When combining multiple models of different inter-related systems into one system-of-system model (i.e., [Composite Models](https://nasa.github.io/progpy/api_ref/prog_models/CompositeModel.html)), or\n",
-    "2. Combining multiple models of the same system to be simulated together and aggregated (i.e., [Ensemble Models](https://nasa.github.io/progpy/api_ref/prog_models/EnsembleModel.html)). This is generally done to improve the accuracy of prediction when you have multiple models that each represent part of the behavior or represent a distribution of different behaviors. \n",
+    "2. Combining multiple models of the same system to be simulated together and aggregated (i.e., [Ensemble Models](https://nasa.github.io/progpy/api_ref/prog_models/EnsembleModel.html) or [Mixture of Expert Models](https://nasa.github.io/progpy/api_ref/progpy/MixtureOfExperts.html)). This is generally done to improve the accuracy of prediction when you have multiple models that each represent part of the behavior or represent a distribution of different behaviors. \n",
     "\n",
     "These two methods for combining models are described in the following sections."
    ]

diff --git a/examples/07_State Estimation.ipynb b/examples/07_State Estimation.ipynb