Skip to content

Commit c673683

Browse files
committed
refactor(validation): rename validation module to evaluation
1 parent 98b56ff commit c673683

33 files changed

+103
-106
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Calculate base metrics
2+
3+
::: eis_toolkit.evaluation.calculate_base_metrics
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Classification label evaluation
2+
3+
::: eis_toolkit.evaluation.classification_label_evaluation
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Classification probability evaluation
2+
3+
::: eis_toolkit.evaluation.classification_probability_evaluation
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Plot confusion matrix
2+
3+
::: eis_toolkit.evaluation.plot_confusion_matrix
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Plot neural network training performance (accuracy and loss)
22

3-
::: eis_toolkit.validation.plot_nn_model_performance
3+
::: eis_toolkit.evaluation.plot_nn_model_performance
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Plot prediction-area (P-A) curves
2+
3+
::: eis_toolkit.evaluation.plot_prediction_area_curves

docs/evaluation/plot_rate_curve.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Plot rate curve
2+
3+
::: eis_toolkit.evaluation.plot_rate_curve

docs/validation/calculate_base_metrics.md

-3
This file was deleted.

docs/validation/classification_label_evaluation.md

-3
This file was deleted.

docs/validation/classification_probability_evaluation.md

-3
This file was deleted.

docs/validation/plot_confusion_matrix.md

-3
This file was deleted.

docs/validation/plot_prediction_area_curves.md

-3
This file was deleted.

docs/validation/plot_rate_curve.md

-3
This file was deleted.

eis_toolkit/cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,7 @@ def winsorize_transform_cli(
28792879
typer.echo(f"Winsorize transform completed, writing raster to {output_raster}.")
28802880

28812881

2882-
# ---VALIDATION ---
2882+
# ---EVALUATION ---
28832883
# TODO
28842884

28852885

File renamed without changes.
File renamed without changes.

eis_toolkit/prediction/machine_learning_general.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
from sklearn.base import BaseEstimator
1414
from sklearn.model_selection import KFold, LeaveOneOut, StratifiedKFold, train_test_split
1515

16+
from eis_toolkit.evaluation.scoring import score_predictions
1617
from eis_toolkit.exceptions import (
1718
InvalidParameterValueException,
1819
NonMatchingParameterLengthsException,
1920
NonMatchingRasterMetadataException,
2021
)
2122
from eis_toolkit.utilities.checks.raster import check_raster_grids
22-
from eis_toolkit.validation.scoring import score_predictions
2323
from eis_toolkit.vector_processing.rasterize_vector import rasterize_vector
2424

2525
SPLIT = "split"

notebooks/validation_functions.ipynb notebooks/evaluation_functions.ipynb

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# Validation funtions\n",
7+
"# Evaluation funtions\n",
88
"\n",
9-
"Purpose of this notebook is to demonstrate and test validation functions"
9+
"Purpose of this notebook is to demonstrate and test evaluation functions"
1010
]
1111
},
1212
{
@@ -23,9 +23,9 @@
2323
"\n",
2424
"import sys\n",
2525
"sys.path.insert(0, \"..\")\n",
26-
"from eis_toolkit.validation.calculate_base_metrics import calculate_base_metrics\n",
27-
"from eis_toolkit.validation.plot_rate_curve import plot_rate_curve\n",
28-
"from eis_toolkit.validation.plot_prediction_area_curves import plot_prediction_area_curves"
26+
"from eis_toolkit.evaluation.calculate_base_metrics import calculate_base_metrics\n",
27+
"from eis_toolkit.evaluation.plot_rate_curve import plot_rate_curve\n",
28+
"from eis_toolkit.evaluation.plot_prediction_area_curves import plot_prediction_area_curves"
2929
]
3030
},
3131
{

notebooks/testing_classifier_evaluation.ipynb

+70-73
Large diffs are not rendered by default.

tests/validation/calculate_base_metrics_test.py tests/evaluation/calculate_base_metrics_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import pytest
66
import rasterio
77

8+
from eis_toolkit.evaluation.calculate_base_metrics import calculate_base_metrics
89
from eis_toolkit.exceptions import GeometryTypeException, NonMatchingCrsException
9-
from eis_toolkit.validation.calculate_base_metrics import calculate_base_metrics
1010

1111
test_dir = Path(__file__).parent.parent
1212
raster_path = test_dir.joinpath("data/remote/small_raster.tif")

tests/validation/plot_confusion_matrix_test.py tests/evaluation/plot_confusion_matrix_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import numpy as np
33
import pytest
44

5+
from eis_toolkit.evaluation.plot_confusion_matrix import plot_confusion_matrix
56
from eis_toolkit.exceptions import InvalidDataShapeException
6-
from eis_toolkit.validation.plot_confusion_matrix import plot_confusion_matrix
77

88

99
def test_plot_confusion_matrix():

tests/validation/plot_nn_model_performance_test.py tests/evaluation/plot_nn_model_performance_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
from sklearn.model_selection import train_test_split
55
from sklearn.preprocessing import StandardScaler
66

7+
from eis_toolkit.evaluation.plot_nn_model_performance import plot_nn_model_accuracy, plot_nn_model_loss
78
from eis_toolkit.exceptions import InvalidDatasetException, InvalidDataShapeException
89
from eis_toolkit.prediction.mlp import train_MLP_classifier
910
from eis_toolkit.transformations.one_hot_encoding import one_hot_encode
10-
from eis_toolkit.validation.plot_nn_model_performance import plot_nn_model_accuracy, plot_nn_model_loss
1111

1212
X_IRIS, Y_IRIS = load_iris(return_X_y=True)
1313
X_DIABETES, Y_DIABETES = load_diabetes(return_X_y=True)

tests/validation/plot_prediction_area_curves_test.py tests/evaluation/plot_prediction_area_curves_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import numpy as np
22
import pytest
33

4+
from eis_toolkit.evaluation.plot_prediction_area_curves import _get_pa_intersection, plot_prediction_area_curves
45
from eis_toolkit.exceptions import InvalidParameterValueException
5-
from eis_toolkit.validation.plot_prediction_area_curves import _get_pa_intersection, plot_prediction_area_curves
66

77

88
def test_get_pa_intersection():

tests/validation/plot_rate_curve_test.py tests/evaluation/plot_rate_curve_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import numpy as np
22
import pytest
33

4+
from eis_toolkit.evaluation.plot_rate_curve import plot_rate_curve
45
from eis_toolkit.exceptions import InvalidParameterValueException
5-
from eis_toolkit.validation.plot_rate_curve import plot_rate_curve
66

77

88
def test_plot_rate_curve_x_values_out_of_bound():

tests/validation/scoring_test.py tests/evaluation/scoring_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from sklearn.datasets import make_classification
22
from sklearn.model_selection import train_test_split
33

4+
from eis_toolkit.evaluation.scoring import score_predictions
45
from eis_toolkit.prediction.machine_learning_predict import predict_classifier
56
from eis_toolkit.prediction.random_forests import random_forest_classifier_train
6-
from eis_toolkit.validation.scoring import score_predictions
77

88
X, y = make_classification(n_samples=200, n_features=20, n_informative=2, n_redundant=10, random_state=42)
99
X_train, X_test, y_train, y_test = train_test_split(X, y, random_state=42)

tests/prediction/machine_learning_general_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from sklearn.datasets import load_iris
77
from sklearn.ensemble import RandomForestClassifier
88

9+
from eis_toolkit.evaluation.scoring import score_predictions
910
from eis_toolkit.exceptions import InvalidParameterValueException, NonMatchingParameterLengthsException
1011
from eis_toolkit.prediction.machine_learning_general import (
1112
_train_and_validate_sklearn_model,
@@ -14,7 +15,6 @@
1415
split_data,
1516
)
1617
from eis_toolkit.prediction.machine_learning_predict import predict_classifier
17-
from eis_toolkit.validation.scoring import score_predictions
1818

1919
TEST_DIR = Path(__file__).parent.parent
2020

0 commit comments

Comments
 (0)