Skip to content

Commit

Permalink
Bump version to 0.3.0; update category predictions in README and docu…
Browse files Browse the repository at this point in the history 
…mentation; enhance Jupyter notebook examples with score calculations
  • Loading branch information
@DhyeyMavani2003
DhyeyMavani2003 committed Jan 24, 2025
1 parent bd7400c commit 581c98e
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 47 deletions.
10 changes: 5 additions & 5 deletions .github/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ SCCRAM 0->1: 1.000000
Category Predictions: X → Y
----------------------------------------
X Category Predicted Y Category
0 0 2
1 1 1
2 2 0
3 3 1
4 4 2
0 1 3
1 2 2
2 3 1
3 4 2
4 5 3
```

## Features
Expand Down
2 changes: 1 addition & 1 deletion discopula/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
permutation_test_ccram,
)

__version__ = "0.2.3"
__version__ = "0.3.0"
__all__ = [
"GenericCheckerboardCopula",
"gen_contingency_to_case_form",
Expand Down
10 changes: 5 additions & 5 deletions docs/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ SCCRAM 0->1: 1.000000
Category Predictions: X → Y
----------------------------------------
X Category Predicted Y Category
0 0 2
1 1 1
2 2 0
3 3 1
4 4 2
0 1 3
1 2 2
2 3 1
3 4 2
4 5 3
```

## Features
Expand Down
89 changes: 53 additions & 36 deletions examples/jupyter/01_Basic_GenericCheckerboardCopula_Usage_Demonstration.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,20 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Collecting discopula\n",
" Downloading discopula-0.2.1-py3-none-any.whl.metadata (5.2 kB)\n",
"Requirement already satisfied: numpy in /usr/local/lib/python3.10/dist-packages (from discopula) (1.26.4)\n",
"Requirement already satisfied: scipy in /usr/local/lib/python3.10/dist-packages (from discopula) (1.13.1)\n",
"Requirement already satisfied: matplotlib in /usr/local/lib/python3.10/dist-packages (from discopula) (3.8.0)\n",
"Requirement already satisfied: contourpy>=1.0.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (1.3.1)\n",
"Requirement already satisfied: cycler>=0.10 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (0.12.1)\n",
"Requirement already satisfied: fonttools>=4.22.0 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (4.55.3)\n",
"Requirement already satisfied: kiwisolver>=1.0.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (1.4.7)\n",
"Requirement already satisfied: packaging>=20.0 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (24.2)\n",
"Requirement already satisfied: pillow>=6.2.0 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (11.0.0)\n",
"Requirement already satisfied: pyparsing>=2.3.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (3.2.0)\n",
"Requirement already satisfied: python-dateutil>=2.7 in /usr/local/lib/python3.10/dist-packages (from matplotlib->discopula) (2.8.2)\n",
"Requirement already satisfied: six>=1.5 in /usr/local/lib/python3.10/dist-packages (from python-dateutil>=2.7->matplotlib->discopula) (1.17.0)\n",
"Downloading discopula-0.2.1-py3-none-any.whl (39 kB)\n",
"Installing collected packages: discopula\n",
"Successfully installed discopula-0.2.1\n"
"Requirement already satisfied: discopula in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (0.2.3)\n",
"Requirement already satisfied: numpy in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from discopula) (2.1.3)\n",
"Requirement already satisfied: scipy in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from discopula) (1.14.1)\n",
"Requirement already satisfied: matplotlib in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from discopula) (3.10.0)\n",
"Requirement already satisfied: contourpy>=1.0.1 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (1.3.1)\n",
"Requirement already satisfied: cycler>=0.10 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (0.12.1)\n",
"Requirement already satisfied: fonttools>=4.22.0 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (4.55.3)\n",
"Requirement already satisfied: kiwisolver>=1.3.1 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (1.4.8)\n",
"Requirement already satisfied: packaging>=20.0 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (24.2)\n",
"Requirement already satisfied: pillow>=8 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (11.0.0)\n",
"Requirement already satisfied: pyparsing>=2.3.1 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (3.2.0)\n",
"Requirement already satisfied: python-dateutil>=2.7 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from matplotlib->discopula) (2.9.0.post0)\n",
"Requirement already satisfied: six>=1.5 in /opt/anaconda3/envs/discopula/lib/python3.13/site-packages (from python-dateutil>=2.7->matplotlib->discopula) (1.17.0)\n",
"Note: you may need to restart the kernel to use updated packages.\n"
]
}
],
Expand Down Expand Up @@ -83,7 +80,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 3,
"metadata": {
"colab": {
"base_uri": "https://localhost:8080/"
Expand All @@ -102,12 +99,7 @@
" [0. 0.125 0. ]\n",
" [0.25 0. 0. ]\n",
" [0. 0.125 0. ]\n",
" [0. 0. 0.25 ]]\n",
"[[0 0 2]\n",
" [0 1 0]\n",
" [2 0 0]\n",
" [0 1 0]\n",
" [0 0 2]]\n"
" [0. 0. 0.25 ]]\n"
]
}
],
Expand Down Expand Up @@ -240,20 +232,20 @@
"\n",
"Predictions from axis 0 to axis 1:\n",
" X Category Predicted Y Category\n",
"0 0 2\n",
"1 1 1\n",
"2 2 0\n",
"3 3 1\n",
"4 4 2\n",
"0 1 3\n",
"1 2 2\n",
"2 3 1\n",
"3 4 2\n",
"4 5 3\n",
"\n",
"Category Predictions: Y → X\n",
"----------------------------------------\n",
"\n",
"Predictions from axis 1 to axis 0:\n",
" Y Category Predicted X Category\n",
"0 0 2\n",
"1 1 2\n",
"2 2 2\n"
"0 1 3\n",
"1 2 3\n",
"2 3 3\n"
]
}
],
Expand All @@ -275,9 +267,24 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 7,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Scores for axis 0:\n",
"[np.float64(0.125), np.float64(0.3125), np.float64(0.5), np.float64(0.6875), np.float64(0.875)]\n",
"\n",
"Scores for axis 1:\n",
"[np.float64(0.125), np.float64(0.375), np.float64(0.75)]\n",
"\n",
"Variance of scores for axis 0: 0.0791015625\n",
"Variance of scores for axis 1: 0.0703125\n"
]
}
],
"source": [
"# Calculate and display scores for both axes\n",
"scores_axis0 = copula.calculate_scores(0)\n",
Expand Down Expand Up @@ -305,11 +312,21 @@
"provenance": []
},
"kernelspec": {
"display_name": "Python 3",
"display_name": "discopula",
"language": "python",
"name": "python3"
},
"language_info": {
"name": "python"
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.13.0"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 581c98e

Please sign in to comment.