Adding the changes

IDAES · Feb 9, 2024 · 4cfd7eb · 4cfd7eb
1 parent 10c3200
commit 4cfd7eb
Show file tree

Hide file tree

Showing 63 changed files with 101 additions and 156 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -78,7 +78,7 @@ jobs:
         run: |
           pwd
           ls idaes_examples
-          pytest -v idaes_examples --ignore=idaes_examples/notebooks/docs/surrogates/SCO2_example/ALAMO/ 
+          pytest -v idaes_examples --ignore=idaes_examples/notebooks/docs/surrogates/sco2/alamo/ 
       - name: Upload pytest-xdist worker logs
         if: success() || failure()
         uses: actions/upload-artifact@v3

diff --git a/idaes_examples/notebooks/_toc.yml b/idaes_examples/notebooks/_toc.yml
@@ -81,21 +81,21 @@ parts:
   - file: docs/surrogates/omlt/index
     sections:
     - file: docs/surrogates/omlt/keras_flowsheet_optimization_doc
-  - file: docs/surrogates/SCO2_example/ALAMO/index
+  - file: docs/surrogates/sco2/alamo/index
     sections:
-    - file: docs/surrogates/SCO2_example/ALAMO/SCO2_alamo_surrogate_doc
-    - file: docs/surrogates/SCO2_example/ALAMO/SCO2_properties_alamo_surrogate_embedding_doc
-    - file: docs/surrogates/SCO2_example/ALAMO/SCO2_flowsheet_alamo_surrogate_doc
-  - file: docs/surrogates/SCO2_example/OMLT/index
+    - file: docs/surrogates/sco2/alamo/alamo_training_doc
+    - file: docs/surrogates/sco2/alamo/surrogate_embedding_doc
+    - file: docs/surrogates/sco2/alamo/flowsheet_optimization_doc
+  - file: docs/surrogates/sco2/omlt/index
     sections:
-    - file: docs/surrogates/SCO2_example/OMLT/SCO2_keras_surrogate_doc
-    - file: docs/surrogates/SCO2_example/OMLT/SCO2_properties_keras_surrogate_embedding_doc
-    - file: docs/surrogates/SCO2_example/OMLT/SCO2_flowsheet_keras_surrogate_doc
-  - file: docs/surrogates/SCO2_example/PySMO/index
+    - file: docs/surrogates/sco2/omlt/omlt_training_doc
+    - file: docs/surrogates/sco2/omlt/surrogate_embedding_doc
+    - file: docs/surrogates/sco2/omlt/flowsheet_optimization_doc
+  - file: docs/surrogates/sco2/pysmo/index
     sections:
-    - file: docs/surrogates/SCO2_example/PySMO/SCO2_pysmo_surrogate_doc
-    - file: docs/surrogates/SCO2_example/PySMO/SCO2_properties_pysmo_surrogate_embedding_doc
-    - file: docs/surrogates/SCO2_example/PySMO/SCO2_flowsheet_pysmo_surrogate_doc
+    - file: docs/surrogates/sco2/pysmo/pysmo_training_doc
+    - file: docs/surrogates/sco2/pysmo/surrogate_embedding_doc
+    - file: docs/surrogates/sco2/pysmo/flowsheet_optimization_doc
 - caption: Power generation
   chapters:
   - file: docs/power_gen/supercritical/index

diff --git a/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/fingerprint.pb b/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/fingerprint.pb
diff --git a/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/idaes_info.json b/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/idaes_info.json
diff --git a/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/keras_metadata.pb b/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/keras_metadata.pb
diff --git a/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/saved_model.pb b/idaes_examples/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/saved_model.pb
diff --git a/...docs/surrogates/SCO2_example/OMLT/keras_surrogate/variables/variables.data-00000-of-00001 b/...docs/surrogates/SCO2_example/OMLT/keras_surrogate/variables/variables.data-00000-of-00001
diff --git a/...les/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/variables/variables.index b/...les/notebooks/docs/surrogates/SCO2_example/OMLT/keras_surrogate/variables/variables.index
diff --git a/idaes_examples/notebooks/docs/surrogates/SCO2_example/PySMO/pysmo_poly_surrogate.json b/idaes_examples/notebooks/docs/surrogates/SCO2_example/PySMO/pysmo_poly_surrogate.json
diff --git a/...gates/SCO2_example/500_Points_DataSet.csv → ...cs/surrogates/sco2/500_Points_DataSet.csv b/...gates/SCO2_example/500_Points_DataSet.csv → ...cs/surrogates/sco2/500_Points_DataSet.csv
diff --git a/...surrogates/SCO2_example/CO2_flowsheet.png → ...ks/docs/surrogates/sco2/CO2_flowsheet.png b/...surrogates/SCO2_example/CO2_flowsheet.png → ...ks/docs/surrogates/sco2/CO2_flowsheet.png
diff --git a/...surrogates/SCO2_example/ALAMO/__init__.py → ...otebooks/docs/surrogates/sco2/__init__.py b/...surrogates/SCO2_example/ALAMO/__init__.py → ...otebooks/docs/surrogates/sco2/__init__.py
diff --git a/.../surrogates/SCO2_example/OMLT/__init__.py → ...ks/docs/surrogates/sco2/alamo/__init__.py b/.../surrogates/SCO2_example/OMLT/__init__.py → ...ks/docs/surrogates/sco2/alamo/__init__.py
diff --git a/...rrogates/SCO2_example/ALAMO/alamo_run.trc → .../docs/surrogates/sco2/alamo/alamo_run.trc b/...rrogates/SCO2_example/ALAMO/alamo_run.trc → .../docs/surrogates/sco2/alamo/alamo_run.trc
diff --git a/...s/SCO2_example/ALAMO/alamo_surrogate.json → ...urrogates/sco2/alamo/alamo_surrogate.json b/...s/SCO2_example/ALAMO/alamo_surrogate.json → ...urrogates/sco2/alamo/alamo_surrogate.json
diff --git a/..._example/ALAMO/SCO2_alamo_surrogate.ipynb → ...urrogates/sco2/alamo/alamo_training.ipynb b/..._example/ALAMO/SCO2_alamo_surrogate.ipynb → ...urrogates/sco2/alamo/alamo_training.ipynb
@@ -567,7 +567,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Now, the surrogate is trained and validated, we shall embed it in the property package, which is demonstrated in the [SCO2_properties_alamo_surrogate_embedding](https://github.com/IDAES/examples/blob/supercritcial_CO2_example/idaes_examples/notebooks/docs/surrogates/SCO2_example/ALAMO/SCO2_properties_alamo_surrogate_embedding.ipynb) file."
+    "Now, the surrogate is trained and validated, we shall embed it in the property package, which is demonstrated in the [surrogate_embedding](https://github.com/IDAES/examples/blob/supercritcial_CO2_example/idaes_examples/notebooks/docs/surrogates/sco2/alamo/surrogate_embedding.ipynb) file."
    ]
   }
  ],

diff --git a/...mple/ALAMO/SCO2_alamo_surrogate_doc.ipynb → ...gates/sco2/alamo/alamo_training_doc.ipynb b/...mple/ALAMO/SCO2_alamo_surrogate_doc.ipynb → ...gates/sco2/alamo/alamo_training_doc.ipynb
@@ -567,7 +567,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "Now, the surrogate is trained and validated, we shall embed it in the property package, which is demonstrated in the [SCO2_properties_alamo_surrogate_embedding](https://github.com/IDAES/examples/blob/supercritcial_CO2_example/idaes_examples/notebooks/docs/surrogates/SCO2_example/ALAMO/SCO2_properties_alamo_surrogate_embedding_doc.md) file."
+        "Now, the surrogate is trained and validated, we shall embed it in the property package, which is demonstrated in the [surrogate_embedding](https://github.com/IDAES/examples/blob/supercritcial_CO2_example/idaes_examples/notebooks/docs/surrogates/sco2/alamo/surrogate_embedding_doc.md) file."
       ]
     }
   ],