20-resampling-2d-intervalsamples (#49)

* WIP - 2d resampling still in progress, not yet suitable for use. * commit CHANGELOG.rst * added Ash to components.py * added lo, hi suffixes to config * fix get_components logical error * WIP - recreating results from paper * WIP * initial version of interp2d - cleanup required. * 1d sample interp bug fix. unit test for upsample 2d. * added output estimate coercion * added coerce_input_estimates * added moisture support to coerce_estimates * added healthy properties to flowsheet * added unhealthy records dataframes * added coerce component mass. * improved coercion. * nans will no longer cause unbalanced nodes. A little dangerous? * renamed get_edge_by_name to get_stream_by_name * bugfix for get_edge_by_name * new test * improved coerce_estimates * WIP updates * balance_composition affected index bugfix * tweaked coercion to use clip_recovery * last chance fix for coerce_estimates. bug-fix for clip_composition. * fs.to_dataframe enhancement. estimates bug fix. * fs.to_dataframe column order fix * fs.to_dataframe column order fix #2 * fs.to_dataframe column order fix #3 * fs.to_dataframe column order fix #4 * modified split_by_partition to take a series. * pandas div-zero fix. create_interval_index bugfix for 2d. * renamed from_dict method of flowsheet. * partition bugfix for 2d case * IntervalSample typing fix in operation.py * Fix for assignment of pn for various input types in interval_sample.py * Changed flowsheet yaml definition, and name matched the partitioned result to correct stream * node/operation status update fix for flowsheet.solve * bugfix for operation input/output mass in the empty case * bugfix for plotting network with integer name * topological_sort before solve for flowsheet. * Managed VolumeElement (onfv1) with TYPECHECKING guard until omfpandas v1/v2 is sorted out. * moisture in scope fix for operation.solve * WIP - 2d resampling still in progress, not yet suitable for use. * added Ash to components.py * fix get_components logical error * WIP - recreating results from paper * WIP * initial version of interp2d - cleanup required. * 1d sample interp bug fix. unit test for upsample 2d. * added output estimate coercion * added coerce_input_estimates * added moisture support to coerce_estimates * added healthy properties to flowsheet * added unhealthy records dataframes * added coerce component mass. * improved coercion. * nans will no longer cause unbalanced nodes. A little dangerous? * renamed get_edge_by_name to get_stream_by_name * bugfix for get_edge_by_name * new test * improved coerce_estimates * WIP updates * balance_composition affected index bugfix * tweaked coercion to use clip_recovery * last chance fix for coerce_estimates. bug-fix for clip_composition. * fs.to_dataframe enhancement. estimates bug fix. * fs.to_dataframe column order fix * fs.to_dataframe column order fix #2 * fs.to_dataframe column order fix #3 * fs.to_dataframe column order fix #4 * pandas div-zero fix. create_interval_index bugfix for 2d. * renamed from_dict method of flowsheet. * partition bugfix for 2d case * IntervalSample typing fix in operation.py * Fix for assignment of pn for various input types in interval_sample.py * Changed flowsheet yaml definition, and name matched the partitioned result to correct stream * node/operation status update fix for flowsheet.solve * bugfix for operation input/output mass in the empty case * bugfix for plotting network with integer name * topological_sort before solve for flowsheet. * Managed VolumeElement (onfv1) with TYPECHECKING guard until omfpandas v1/v2 is sorted out. * moisture in scope fix for operation.solve * fixed post 2d resampling merge. 2d resampling incorrect and incomplete, but merge needed for other inclusions on this branch. * Numerous bugfixes; coercion, nans, balance. Foundational work for 2d resampling, however NOTE - results incorrect - more work required. * bump version for pyvista headless display
elphick · Jan 23, 2025 · 06fdbf1 · 06fdbf1
1 parent b5ddc46
commit 06fdbf1
Show file tree

Hide file tree

Showing 31 changed files with 2,284 additions and 1,121 deletions.
diff --git a/.github/workflows/poetry_build_and_test.yml b/.github/workflows/poetry_build_and_test.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup headless display
-        uses: pyvista/setup-headless-display-action@v1
+        uses: pyvista/setup-headless-display-action@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

diff --git a/.github/workflows/poetry_sphinx_docs_to_gh_pages.yml b/.github/workflows/poetry_sphinx_docs_to_gh_pages.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup headless display
-        uses: pyvista/setup-headless-display-action@v1
+        uses: pyvista/setup-headless-display-action@v3
 
       - name: Set up Python
         uses: actions/setup-python@v4

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+Geomet 0.4.10 (2025-01-23)
+==========================
+
+Other Tasks
+-----------
+
+- Numerous bugfixes; coercion, nans, balance. Foundational work for 2d resampling, however NOTE - results incorrect - more work required. (#20)
+
+
 Geomet 0.4.9 (2024-11-25)
 =========================
 

diff --git a/docs/source/sg_execution_times.rst b/docs/source/sg_execution_times.rst
@@ -6,7 +6,7 @@
 
 Computation times
 =================
-**01:04.321** total execution time for 17 files **from all galleries**:
+**00:59.952** total execution time for 18 files **from all galleries**:
 
 .. container::
 
@@ -32,20 +32,32 @@ Computation times
    * - Example
      - Time
      - Mem (MB)
-   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_02_create_block_model.py` (``..\..\examples\04_block_model\02_create_block_model.py``)
-     - 00:52.411
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_03_incremental_separation.py` (``..\..\examples\02_interval_sample\03_incremental_separation.py``)
+     - 00:22.251
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_03_load_block_model.py` (``..\..\examples\04_block_model\03_load_block_model.py``)
-     - 00:08.409
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_01_interval_sample.py` (``..\..\examples\02_interval_sample\01_interval_sample.py``)
+     - 00:15.470
+     - 0.0
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_05_resampling_interval_data.py` (``..\..\examples\02_interval_sample\05_resampling_interval_data.py``)
+     - 00:07.126
+     - 0.0
+   * - :ref:`sphx_glr_auto_examples_examples_03_flowsheet_01_flowsheet_basics.py` (``..\..\examples\03_flowsheet\01_flowsheet_basics.py``)
+     - 00:05.359
      - 0.0
    * - :ref:`sphx_glr_auto_examples_examples_03_flowsheet_02_flowsheet_from_file.py` (``..\..\examples\03_flowsheet\02_flowsheet_from_file.py``)
-     - 00:03.155
+     - 00:02.471
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_06_map_01_mapping.py` (``..\..\examples\06_map\01_mapping.py``)
-     - 00:00.196
+   * - :ref:`sphx_glr_auto_examples_examples_03_flowsheet_03_filtering_flowsheet.py` (``..\..\examples\03_flowsheet\03_filtering_flowsheet.py``)
+     - 00:01.982
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_05_mass_balance_01_mass_balance.py` (``..\..\examples\05_mass_balance\01_mass_balance.py``)
-     - 00:00.150
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_06_resampling_interval_data_2d.py` (``..\..\examples\02_interval_sample\06_resampling_interval_data_2d.py``)
+     - 00:01.978
+     - 0.0
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_04_partition_models.py` (``..\..\examples\02_interval_sample\04_partition_models.py``)
+     - 00:01.849
+     - 0.0
+   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_02_interval_data_sink_float.py` (``..\..\examples\02_interval_sample\02_interval_data_sink_float.py``)
+     - 00:01.467
      - 0.0
    * - :ref:`sphx_glr_auto_examples_examples_01_getting_started_01_create_sample.py` (``..\..\examples\01_getting_started\01_create_sample.py``)
      - 00:00.000
@@ -59,27 +71,18 @@ Computation times
    * - :ref:`sphx_glr_auto_examples_examples_01_getting_started_04_filtering.py` (``..\..\examples\01_getting_started\04_filtering.py``)
      - 00:00.000
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_01_interval_sample.py` (``..\..\examples\02_interval_sample\01_interval_sample.py``)
-     - 00:00.000
-     - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_02_interval_data_sink_float.py` (``..\..\examples\02_interval_sample\02_interval_data_sink_float.py``)
-     - 00:00.000
-     - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_03_incremental_separation.py` (``..\..\examples\02_interval_sample\03_incremental_separation.py``)
-     - 00:00.000
-     - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_04_partition_models.py` (``..\..\examples\02_interval_sample\04_partition_models.py``)
+   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_01_consuming_omf.py` (``..\..\examples\04_block_model\01_consuming_omf.py``)
      - 00:00.000
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_02_interval_sample_05_resampling_interval_data.py` (``..\..\examples\02_interval_sample\05_resampling_interval_data.py``)
+   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_02_create_block_model.py` (``..\..\examples\04_block_model\02_create_block_model.py``)
      - 00:00.000
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_03_flowsheet_01_flowsheet_basics.py` (``..\..\examples\03_flowsheet\01_flowsheet_basics.py``)
+   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_03_load_block_model.py` (``..\..\examples\04_block_model\03_load_block_model.py``)
      - 00:00.000
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_03_flowsheet_03_filtering_flowsheet.py` (``..\..\examples\03_flowsheet\03_filtering_flowsheet.py``)
+   * - :ref:`sphx_glr_auto_examples_examples_05_mass_balance_01_mass_balance.py` (``..\..\examples\05_mass_balance\01_mass_balance.py``)
      - 00:00.000
      - 0.0
-   * - :ref:`sphx_glr_auto_examples_examples_04_block_model_01_consuming_omf.py` (``..\..\examples\04_block_model\01_consuming_omf.py``)
+   * - :ref:`sphx_glr_auto_examples_examples_06_map_01_mapping.py` (``..\..\examples\06_map\01_mapping.py``)
      - 00:00.000
      - 0.0
diff --git a/elphick/geomet/__init__.py b/elphick/geomet/__init__.py
@@ -3,7 +3,6 @@
 
 from .sample import Sample
 from .interval_sample import IntervalSample
-from .block_model import BlockModel
 
 try:
     __version__ = metadata.version('geometallurgy')