Fix tests

Author: teubert

.github/workflows/python-package.yml

@@ -99,7 +99,7 @@ jobs:
     - name: Update
       run: pip install --upgrade --upgrade-strategy eager -e .
     - name: Run tests
-      run: python -m tests.test_composites
+      run: python -m tests.test_composite
   test_data_model:
     timeout-minutes: 15
     runs-on: ubuntu-latest

scripts/test_copyright.py

@@ -35,12 +35,14 @@ def check_copyright(directory: str, invalid_files: list) -> bool:
 def main():
     print("\n\nTesting Files for Copyright Information")
 
-    root = '../prog_models'
+    root = '../progpy'
     invalid_files = []
     copyright_confirmed = check_copyright(root, invalid_files)
 
     if not copyright_confirmed:
         raise Exception(f"Failed test\nFiles missing copyright information: {invalid_files}")
+    else:
+        print('No missing copyright statements')
 
 if __name__ == '__main__':
     main()

tutorial.ipynb

@@ -25,22 +25,22 @@
     "* __States__: Internal parameters (typically hidden states) used to represent the state of the system- can be the same as inputs/outputs but do not have to be.\n",
     "* __Performance Metrics__: Performance characteristics of a system that are a function of system state, but are not directly measured. For example, a performance metric for a electric motor might be the maximum achievable torque \n",
     "\n",
-    "The `prog_models` package has the following structure\n",
-    "* `prog_models.data_models` - package containing algorithms for data-driven models, and parent class `prog_models.data_models.DataModel`\n",
-    "* `prog_models.datasets` - package containing tools for downloading a few relevant datasets\n",
-    "* `prog_models.loading` - package containing tools for representing different loading profiles\n",
-    "* `prog_models.models.*` - implemented models (e.g., pump, valve, battery)\n",
-    "* `prog_models.utils.*` - various utility functions and classes\n",
-    "* `prog_models.CompositeModel` - model of a system-of-systems, combining multiple interrelated models into a single model\n",
-    "* `prog_model.EnsembleModel` - model combining multiple models of the same system into a single model\n",
-    "* `prog_models.LinearModel` - parent class for simple linear models\n",
-    "* `prog_models.PrognosticsModel` - parent class for all prognostics models - defines interfaces that a model must implement, and tools for simulating said model\n",
+    "The `progpy` package has the following structure\n",
+    "* `progpy.data_models` - package containing algorithms for data-driven models, and parent class `prog_models.data_models.DataModel`\n",
+    "* `progpy.datasets` - package containing tools for downloading a few relevant datasets\n",
+    "* `progpy.loading` - package containing tools for representing different loading profiles\n",
+    "* `progpy.models.*` - implemented models (e.g., pump, valve, battery)\n",
+    "* `progpy.utils.*` - various utility functions and classes\n",
+    "* `progpy.CompositeModel` - model of a system-of-systems, combining multiple interrelated models into a single model\n",
+    "* `progpy.EnsembleModel` - model combining multiple models of the same system into a single model\n",
+    "* `progpy.LinearModel` - parent class for simple linear models\n",
+    "* `progpy.PrognosticsModel` - parent class for all prognostics models - defines interfaces that a model must implement, and tools for simulating said model\n",
     "\n",
-    "In addition to the `prog_models` package, the GitHub repository includes many examples illustrating how to use the package (see `examples/`), a template for implementing a new model (`prog_model_template`), and this tutorial (`tutorial.ipynb`). Documentation  for prog_models and the full ProgPy can be found at <https://nasa.github.io/progpy>,\n",
+    "In addition to the `proypy` package, the GitHub repository includes many examples illustrating how to use the package (see `examples/`), a template for implementing a new model (`prog_model_template`), and this tutorial (`tutorial.ipynb`). Documentation  for ProgPy can be found at <https://nasa.github.io/progpy>,\n",
     "\n",
-    "Before you start, make sure to install prog_models using the following command:\n",
+    "Before you start, make sure to install progpy using the following command:\n",
     "\n",
-    "    pip install prog_models\n",
+    "    pip install progpy\n",
     "\n",
     "Now let's get started with some examples"
    ]
@@ -60,18 +60,18 @@
    "source": [
     "This first example is for using the included prognostics models. \n",
     "\n",
-    "The `prog_models.models` package includes implemented models, including ones for pumps, valves, batteries, and more. See <https://nasa.github.io/progpy/api_ref/prog_models/IncludedModels.html> for a full description of the included models.\n",
+    "The `progpy.models` package includes implemented models, including ones for pumps, valves, batteries, and more. See <https://nasa.github.io/progpy/api_ref/prog_models/IncludedModels.html> for a full description of the included models.\n",
     "\n",
     "First thing to do is to import the model you would like to use:"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "from prog_models.models import BatteryCircuit"
+    "from progpy.models import BatteryCircuit"
    ]
   },
   {
@@ -86,7 +86,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -177,7 +177,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -263,7 +263,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from prog_models.loading import Piecewise\n",
+    "from progpy.loading import Piecewise\n",
     "# Variable (piece-wise) future loading scheme \n",
     "future_loading = Piecewise(batt.InputContainer, [600, 900, 1800, 3000, float('inf')], {'i': [2, 1, 4, 2, 3]})"
    ]
@@ -425,7 +425,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from prog_models.models import ThrownObject\n",
+    "from progpy.models import ThrownObject\n",
     "\n",
     "# Create an instance of the thrown object model with no process noise\n",
     "m = ThrownObject(process_noise=False)\n",
@@ -803,7 +803,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from prog_models import PrognosticsModel\n",
+    "from progpy import PrognosticsModel\n",
     "\n",
     "class ThrownObject(PrognosticsModel):\n",
     "    \"\"\"\n",
@@ -1242,7 +1242,7 @@
     "* `examples.sim`, `examples.sim_battery_eol`, `examples.sim_pump`, `examples.sim_valve`, `examples.sim_powertrain`, `examples.sim_dcmotor_singlephase`: Examples using specific models from `prog_models.models`\n",
     "* `examples.lstm_model`, `examples.full_lstm_model`, and `examples.custom_model`: Examples using data-driven models\n",
     "\n",
-    "Thank you for trying out this tutorial. Open an issue on github (https://github.com/nasa/prog_models/issues) or email Chris Teubert (christopher.a.teubert@nasa.gov) with any questions or issues."
+    "Thank you for trying out this tutorial. Open an issue on github (https://github.com/nasa/progpy/issues) or email Chris Teubert (christopher.a.teubert@nasa.gov) with any questions or issues."
    ]
   },
   {
@@ -1270,7 +1270,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.6"
+   "version": "3.11.0"
   },
   "metadata": {
    "interpreter": {