From 38120c0a4fb3b0d713bdac5f2d319b115b37a517 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Thu, 23 Jan 2025 13:02:52 -0800 Subject: [PATCH] moved data_extraction to data_extractor (#7) --- src/rail/plotting/control.py | 2 +- .../plotting/{data_extraction.py => data_extractor.py} | 0 src/rail/plotting/dataset_factory.py | 8 ++++---- src/rail/plotting/project_dataset_holder.py | 2 +- .../{pz_data_extraction.py => pz_data_extractor.py} | 4 ++-- tests/ci_datasets.yaml | 8 ++++---- tests/plotting/test_dataset_factory.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename src/rail/plotting/{data_extraction.py => data_extractor.py} (100%) rename src/rail/plotting/{pz_data_extraction.py => pz_data_extractor.py} (98%) diff --git a/src/rail/plotting/control.py b/src/rail/plotting/control.py index 31a6524..5eb879b 100644 --- a/src/rail/plotting/control.py +++ b/src/rail/plotting/control.py @@ -11,7 +11,7 @@ from .dataset_factory import RailDatasetFactory from .plotter_factory import RailPlotterFactory from .plot_group_factory import RailPlotGroupFactory -from .data_extraction import RailProjectDataExtractor +from .data_extractor import RailProjectDataExtractor from .dataset_holder import RailDatasetHolder from .plotter import RailPlotter from .plot_group import RailPlotGroup diff --git a/src/rail/plotting/data_extraction.py b/src/rail/plotting/data_extractor.py similarity index 100% rename from src/rail/plotting/data_extraction.py rename to src/rail/plotting/data_extractor.py diff --git a/src/rail/plotting/dataset_factory.py b/src/rail/plotting/dataset_factory.py index d7efa37..4fbf540 100644 --- a/src/rail/plotting/dataset_factory.py +++ b/src/rail/plotting/dataset_factory.py @@ -20,7 +20,7 @@ class RailDatasetFactory: - Dataset: name: gold_baseline_test class: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotting.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotting.pz_data_extractor.PZPointEstimateDataExtractor project: some_project selection: gold flavor: baseline @@ -29,7 +29,7 @@ class RailDatasetFactory: - Dataset: name: blend_baseline_test class: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - exctractor: rail.plottings.pz_data_extraction.PZPointEstimateDataExtractorxs + exctractor: rail.plottings.pz_data_extractor.PZPointEstimateDataExtractorxs project: some_project selection: blend flavor: baseline @@ -94,7 +94,7 @@ def load_yaml(cls, yaml_file: str) -> None: - Dataset: name: gold_baseline_test class: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotters.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotters.pz_data_extractor.PZPointEstimateDataExtractor project: some_project selection: gold flavor: baseline @@ -103,7 +103,7 @@ def load_yaml(cls, yaml_file: str) -> None: - Dataset: name: blend_baseline_test class: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotters.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotters.pz_data_extractor.PZPointEstimateDataExtractor project: some_project selection: blend flavor: baseline diff --git a/src/rail/plotting/project_dataset_holder.py b/src/rail/plotting/project_dataset_holder.py index b98ed8f..32d6866 100644 --- a/src/rail/plotting/project_dataset_holder.py +++ b/src/rail/plotting/project_dataset_holder.py @@ -6,7 +6,7 @@ from rail.projects import RailProject from .dataset_holder import RailDatasetHolder -from .data_extraction import RailProjectDataExtractor +from .data_extractor import RailProjectDataExtractor from .dataset_factory import RailDatasetFactory diff --git a/src/rail/plotting/pz_data_extraction.py b/src/rail/plotting/pz_data_extractor.py similarity index 98% rename from src/rail/plotting/pz_data_extraction.py rename to src/rail/plotting/pz_data_extractor.py index f38b956..77a5d3b 100644 --- a/src/rail/plotting/pz_data_extraction.py +++ b/src/rail/plotting/pz_data_extractor.py @@ -4,7 +4,7 @@ from rail.projects import RailProject -from .data_extraction import RailProjectDataExtractor +from .data_extractor import RailProjectDataExtractor from .data_extraction_funcs import ( get_pz_point_estimate_data, get_ceci_pz_output_path, @@ -125,7 +125,7 @@ def generate_dataset_dict( dataset_dict = dict( name=dataset_name, class_name=dataset_holder_class, - extractor="rail.plotting.pz_data_extraction.PZPointEstimateDataExtractor", + extractor="rail.plotting.pz_data_extractor.PZPointEstimateDataExtractor", project=project_name, flavor=key, algo=algo_, diff --git a/tests/ci_datasets.yaml b/tests/ci_datasets.yaml index d6774d1..bd23507 100644 --- a/tests/ci_datasets.yaml +++ b/tests/ci_datasets.yaml @@ -4,7 +4,7 @@ - Dataset: name: blend_baseline_trainz class_name: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotting.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotting.pz_data_extractor.PZPointEstimateDataExtractor project: ci_test selection: blend flavor: baseline @@ -13,7 +13,7 @@ - Dataset: name: blend_baseline_knn class_name: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotting.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotting.pz_data_extractor.PZPointEstimateDataExtractor project: ci_test selection: blend flavor: baseline @@ -22,7 +22,7 @@ - Dataset: name: blend_baseline_fzboost class_name: rail.plotting.project_dataset_holder.RailProjectDatasetHolder - extractor: rail.plotting.pz_data_extraction.PZPointEstimateDataExtractor + extractor: rail.plotting.pz_data_extractor.PZPointEstimateDataExtractor project: ci_test selection: blend flavor: baseline @@ -37,7 +37,7 @@ - Dataset: name: blend_baseline_all class_name: rail.plotting.project_dataset_holder.RailProjectMultiDatasetHolder - extractor: rail.plotting.pz_data_extraction.PZMultiPointEstimateDataExtractor + extractor: rail.plotting.pz_data_extractor.PZMultiPointEstimateDataExtractor datasets: - blend_baseline_trainz - blend_baseline_knn diff --git a/tests/plotting/test_dataset_factory.py b/tests/plotting/test_dataset_factory.py index 39bfe77..c2bdc75 100644 --- a/tests/plotting/test_dataset_factory.py +++ b/tests/plotting/test_dataset_factory.py @@ -2,7 +2,7 @@ import pytest from rail.plotting.dataset_factory import RailDatasetFactory -from rail.plotting.data_extraction import RailProjectDataExtractor +from rail.plotting.data_extractor import RailProjectDataExtractor from rail.plotting.dataset_holder import RailDatasetHolder from rail.projects import RailProject