From ef57673fb80bc130b989e79ef0efa348d1312176 Mon Sep 17 00:00:00 2001 From: Andreas Huber <9201869+ahuber21@users.noreply.github.com> Date: Fri, 24 Mar 2023 19:12:08 +0100 Subject: [PATCH] chore: update tests after feature selection change (#1213) * chore: update unit test reference values * test(df): allow up to 50% disagreement on log loss * Add updated df_regr numbers for 2023.1.1 * update tests to support both 2023.0.1 and later versions --- .../ensemble/tests/test_decision_forest.py | 7 +- tests/test_examples.py | 6 + ...ision_forest_regression_batch_20230101.csv | 127 ++++++++++++++++++ 3 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 tests/unittest_data/decision_forest_regression_batch_20230101.csv diff --git a/daal4py/sklearn/ensemble/tests/test_decision_forest.py b/daal4py/sklearn/ensemble/tests/test_decision_forest.py index 99419db2d7..c2e165d726 100755 --- a/daal4py/sklearn/ensemble/tests/test_decision_forest.py +++ b/daal4py/sklearn/ensemble/tests/test_decision_forest.py @@ -33,7 +33,12 @@ ACCURACY_RATIO = 0.95 if daal_check_version((2021, 'P', 400)) else 0.85 MSE_RATIO = 1.07 -LOG_LOSS_RATIO = 1.4 if daal_check_version((2021, 'P', 400)) else 1.55 +if daal_check_version((2023, 'P', 101)): + LOG_LOSS_RATIO = 1.5 +elif daal_check_version((2021, 'P', 400)): + LOG_LOSS_RATIO = 1.4 +else: + LOG_LOSS_RATIO = 1.55 ROC_AUC_RATIO = 0.96 RNG = np.random.RandomState(0) IRIS = load_iris() diff --git a/tests/test_examples.py b/tests/test_examples.py index 692bc38225..458ae7dc2c 100755 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -185,6 +185,12 @@ def test_svm_batch(self): 'decision_forest_regression_batch.csv', lambda r: r[1].prediction, (2023, 'P', 1)), ('decision_forest_regression_hist_batch', 'decision_forest_regression_batch.csv', lambda r: r[1].prediction, (2023, 'P', 1)), + ('decision_forest_regression_default_dense_batch', + 'decision_forest_regression_batch_20230101.csv', + lambda r: r[1].prediction, (2023, 'P', 101)), + ('decision_forest_regression_hist_batch', + 'decision_forest_regression_batch_20230101.csv', + lambda r: r[1].prediction, (2023, 'P', 101)), ('decision_tree_classification_batch', 'decision_tree_classification_batch.csv', lambda r: r[1].prediction), ('decision_tree_regression_batch', 'decision_tree_regression_batch.csv', diff --git a/tests/unittest_data/decision_forest_regression_batch_20230101.csv b/tests/unittest_data/decision_forest_regression_batch_20230101.csv new file mode 100644 index 0000000000..0f998713ef --- /dev/null +++ b/tests/unittest_data/decision_forest_regression_batch_20230101.csv @@ -0,0 +1,127 @@ +34.89831424352859 +18.180373120515032 +17.312838483246548 +20.7362321324954 +14.533769858125675 +21.222323118535307 +22.045711094021623 +34.47054355139961 +24.586063193964584 +23.859076282879666 +18.06382025005703 +20.855173428728804 +22.371447255444895 +27.717994818545005 +22.108981505861184 +22.469923548910355 +26.46521441270435 +23.8089313054009 +21.56382150466858 +31.083942348321276 +24.746470773136807 +24.17259844804188 +26.61862987820308 +19.723286948590047 +20.779785351730535 +24.460825432883375 +19.334158275134982 +20.664324204899014 +19.61209430307812 +20.2754785582692 +16.478071435307708 +18.79184400069903 +16.138577801409212 +15.957811049567333 +19.575532005109483 +20.633502291751302 +17.858722119547078 +32.44581147177635 +43.101907758372185 +43.530213714675305 +21.894643836517186 +22.671959287022787 +23.76892796004764 +24.3284982134047 +36.3119317508776 +19.683647198272126 +19.257353593568958 +23.385787312204872 +23.096810763555858 +27.39192825698095 +26.30622427249332 +38.99849460311092 +27.740677476920773 +22.81764965139116 +25.18745673679927 +40.84944779175047 +33.32087551687496 +32.11978161296252 +24.78195090254389 +25.266310661430825 +26.28508069022496 +33.223609581219335 +32.30195949906531 +35.387920515802165 +28.129142363443684 +26.611043691847048 +26.84036074483206 +24.919545876317898 +31.41321240961879 +20.713049551888115 +19.445005498659043 +21.29447782489231 +22.90126438851583 +19.730895764229793 +25.418974651548616 +28.188374744627215 +24.339810878617406 +30.159083114018504 +18.56734353733529 +19.124338934038967 +36.5110543782219 +24.921661793394698 +13.559362243300379 +7.545430133825215 +12.44717937254993 +14.45651021872336 +15.681036065753874 +14.078677302742765 +12.870271453229213 +11.325955143394934 +14.421476704712555 +13.314672289961507 +7.695653954630776 +14.40525866349728 +15.21792367133349 +14.387936110133216 +11.834232588236285 +11.890651581885313 +8.756351155031322 +11.732775001795456 +13.761042807567662 +15.667954665505679 +16.785720200152923 +15.336226126557293 +19.453667801498813 +21.31960075033035 +16.327342560465052 +20.68384444579624 +15.471221494678467 +27.69289855645952 +20.350550543069495 +21.377512332795177 +15.640523112281574 +15.909613200032178 +16.89655987726318 +19.83083364628232 +18.655970558435193 +20.38081298097731 +21.45916975054665 +19.813169702749402 +20.548841585340952 +24.120339418002544 +21.78016603101246 +28.75685449821231 +27.69970958818708 +22.40313903246229 +14.613808007376178