Skip to content

Commit c952c72

Browse files
authored
Merge pull request #663 from EducationalTestingService/release/11.2.0
Release/11.2.0
2 parents e27474d + d35ef2c commit c952c72

File tree

50 files changed

+53
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+53
-11
lines changed

README.rst

Lines changed: 1 addition & 1 deletion

conda-recipe/rsmtool/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package:
22
name: rsmtool
3-
version: 11.1.1
3+
version: 11.2.0
44

55
source:
66
path: ../../../rsmtool
77

88
build:
9-
number: 1
9+
number: 0
1010
noarch: python
1111
script:
1212
- cd $SRC_DIR

rsmtool/notebooks/builtin_model.ipynb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,12 @@
144144
"grey_colors = sns.color_palette('Greys', len(features_used))[::-1]\n",
145145
"with sns.axes_style('whitegrid'):\n",
146146
" ax1=fig.add_subplot(121)\n",
147-
" sns.barplot(x=\"feature\", y=\"standardized\", data=df_betas_sorted, \n",
147+
" sns.barplot(x=\"feature\", y=\"standardized\", hue=\"feature\",\n",
148+
" legend=False, data=df_betas_sorted, \n",
148149
" order=df_betas_sorted['feature'].values,\n",
149-
" palette=sns.color_palette(\"Greys\", 1), ax=ax1)\n",
150-
" ax1.set_xticklabels(df_betas_sorted['feature'].values, rotation=90)\n",
150+
" palette=sns.color_palette(\"Greys\", len(features_used)), ax=ax1)\n",
151+
" tick_positions = np.arange(len(features_used))\n",
152+
" ax1.set_xticks(tick_positions, df_betas_sorted['feature'].values, rotation=90)\n",
151153
" ax1.set_title('Values of standardized coefficients')\n",
152154
" ax1.set_xlabel('')\n",
153155
" ax1.set_ylabel('')\n",

rsmtool/notebooks/comparison/header.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@
432432
"log_msgs = []\n",
433433
"# first check the training set\n",
434434
"if not (outputs_old['df_descriptives'].empty or outputs_new['df_descriptives'].empty):\n",
435-
" oldTrainN = outputs_old['df_descriptives']['N'][0] # take the N from the descriptive stats for the first feature\n",
436-
" newTrainN = outputs_new['df_descriptives']['N'][0]\n",
435+
" oldTrainN = outputs_old['df_descriptives']['N'].iloc[0] # take the N from the descriptive stats for the first feature\n",
436+
" newTrainN = outputs_new['df_descriptives']['N'].iloc[0]\n",
437437
" if oldTrainN != newTrainN:\n",
438438
" log_msg = \"WARNING: the training sets were different sizes. old N: {}, new N: {}.\".format(oldTrainN, newTrainN)\n",
439439
" log_msgs.append(log_msg)\n",

rsmtool/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
in one place. Based on the suggestion `here. <http://bit.ly/16LbuJF>`_
66
"""
77

8-
__version__ = "11.1.1"
8+
__version__ = "11.2.0"
99
VERSION = tuple(int(x) for x in __version__.split("."))

tests/data/experiments/knn-explain/output/knn_rsmexplain.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"num_features_to_display": 15,
1111
"show_auto_cohorts": true,
1212
"standardize_features": true,
13+
"truncate_outliers": true,
1314
"general_sections": [
1415
"all"
1516
],

tests/data/experiments/linearsvr-self-compare/linearsvr/output/LinearSVR_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"use_scaled_predictions": false,
1515
"select_transformations": false,
1616
"standardize_features": true,
17+
"truncate_outliers": true,
1718
"use_thumbnails": false,
1819
"use_truncation_thresholds": false,
1920
"predict_expected_scores": false,

tests/data/experiments/linearsvr-self-summary/linearsvr/output/LinearSVR_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"use_scaled_predictions": false,
1515
"select_transformations": false,
1616
"standardize_features": true,
17+
"truncate_outliers": true,
1718
"use_thumbnails": false,
1819
"use_truncation_thresholds": false,
1920
"predict_expected_scores": false,

tests/data/experiments/lr-different-compare/lr-subset-features/output/lr_subset_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"exclude_zero_scores": true,
1515
"select_transformations": false,
1616
"standardize_features": true,
17+
"truncate_outliers": true,
1718
"use_thumbnails": false,
1819
"use_truncation_thresholds": false,
1920
"predict_expected_scores": false,

tests/data/experiments/lr-different-compare/lr/output/lr_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"exclude_zero_scores": true,
1515
"select_transformations": false,
1616
"standardize_features": true,
17+
"truncate_outliers": true,
1718
"use_thumbnails": false,
1819
"use_truncation_thresholds": false,
1920
"predict_expected_scores": false,

tests/data/experiments/lr-eval-tool-compare/lr-with-h2/output/lr_with_h2_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-dict/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-different-format/lr-with-tsv-output/output/lr_with_tsv_output_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-object/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-chosen-sections/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-custom-order/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-custom-sections-and-custom-order/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-h2/lr-with-h2/output/lr_with_h2_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-subgroups-and-edge-cases/lr-subgroups-with-edge-cases/output/lr_subgroups_with_edge_cases_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"exclude_zero_scores": true,
1818
"select_transformations": false,
1919
"standardize_features": true,
20+
"truncate_outliers": true,
2021
"use_thumbnails": false,
2122
"use_truncation_thresholds": false,
2223
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-subgroups-and-h2/lr-subgroups-with-h2/output/lr_subgroups_with_h2_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"exclude_zero_scores": true,
2020
"select_transformations": false,
2121
"standardize_features": true,
22+
"truncate_outliers": true,
2223
"use_thumbnails": false,
2324
"use_truncation_thresholds": false,
2425
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare-with-thumbnails/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-compare/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-eval-summary/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-dict/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-no-scaling/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-no-trim/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-no-trim/lr-with-trim-tolerance/output/lr_with_trim_tolerance_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-object/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-with-custom-sections/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-with-h2/lr-with-h2/output/lr_with_h2_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-with-tsv-inputs/lr-with-tsv-output/output/lr_with_tsv_output_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-with-tsv-output/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary-with-xlsx-output/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-self-summary/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/lr-with-continuous-human-scores-in-test/output/lr_with_continuous_human_scores_in_test_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-with-continuous-human-scores/output/lr_with_continuous_human_scores_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"exclude_zero_scores": true,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/lr-xval-subgroups-with-int-ids/output/final-model/output/lr_xval_subgroups_with_int_ids_model_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"exclude_zero_scores": true,
1717
"select_transformations": false,
1818
"standardize_features": true,
19+
"truncate_outliers": true,
1920
"use_thumbnails": false,
2021
"use_truncation_thresholds": false,
2122
"predict_expected_scores": false,

tests/data/experiments/lr-xval-subgroups-with-int-ids/output/folds/01/output/lr_xval_subgroups_with_int_ids_fold01_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"exclude_zero_scores": true,
1717
"select_transformations": false,
1818
"standardize_features": true,
19+
"truncate_outliers": true,
1920
"use_thumbnails": false,
2021
"use_truncation_thresholds": false,
2122
"predict_expected_scores": false,

tests/data/experiments/lr-xval-subgroups-with-int-ids/output/folds/02/output/lr_xval_subgroups_with_int_ids_fold02_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"exclude_zero_scores": true,
1717
"select_transformations": false,
1818
"standardize_features": true,
19+
"truncate_outliers": true,
1920
"use_thumbnails": false,
2021
"use_truncation_thresholds": false,
2122
"predict_expected_scores": false,

tests/data/experiments/lr-xval-subgroups-with-int-ids/output/folds/03/output/lr_xval_subgroups_with_int_ids_fold03_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"exclude_zero_scores": true,
1717
"select_transformations": false,
1818
"standardize_features": true,
19+
"truncate_outliers": true,
1920
"use_thumbnails": false,
2021
"use_truncation_thresholds": false,
2122
"predict_expected_scores": false,

tests/data/experiments/rf-explain/output/rf_rsmexplain.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"num_features_to_display": 15,
1111
"show_auto_cohorts": true,
1212
"standardize_features": true,
13+
"truncate_outliers": true,
1314
"general_sections": [
1415
"all"
1516
],

tests/data/experiments/summary-with-custom-names/logistic-regression-expected-scores/output/LogisticRegression_expected_scores_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"use_scaled_predictions": false,
1717
"select_transformations": false,
1818
"standardize_features": true,
19+
"truncate_outliers": true,
1920
"use_thumbnails": false,
2021
"use_truncation_thresholds": false,
2122
"sign": null,

tests/data/experiments/summary-with-custom-names/lr-subgroups/output/lr_subgroups_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"exclude_zero_scores": true,
1919
"select_transformations": false,
2020
"standardize_features": true,
21+
"truncate_outliers": true,
2122
"use_thumbnails": false,
2223
"use_truncation_thresholds": false,
2324
"predict_expected_scores": false,

tests/data/experiments/svc-custom-objective/output/SVC_custom_objective_rsmtool.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"use_scaled_predictions": false,
1616
"select_transformations": false,
1717
"standardize_features": true,
18+
"truncate_outliers": true,
1819
"use_thumbnails": false,
1920
"use_truncation_thresholds": false,
2021
"predict_expected_scores": false,

tests/data/experiments/svr-explain-object/output/svr_explain_object_rsmexplain.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"sample_size": 10,
1010
"num_features_to_display": 15,
1111
"show_auto_cohorts": true,
12+
"truncate_outliers": false,
1213
"standardize_features": true,
1314
"general_sections": [
1415
"all"
@@ -19,6 +20,5 @@
1920
"sample_ids": null,
2021
"use_wandb": false,
2122
"wandb_project": null,
22-
"wandb_entity": null,
23-
"truncate_outliers": false
23+
"wandb_entity": null
2424
}

tests/data/experiments/svr-explain/output/svr_rsmexplain.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"num_features_to_display": 15,
1111
"show_auto_cohorts": true,
1212
"standardize_features": true,
13+
"truncate_outliers": true,
1314
"general_sections": [
1415
"all"
1516
],

0 commit comments

Comments
 (0)