Skip to content

Commit

Permalink
Merge pull request #20 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history 
Version 0.8.5
  • Loading branch information
@sepandhaghighi
sepandhaghighi authored May 20, 2018
2 parents f604ad8 + 398c531 commit d784190
Show file tree
Hide file tree
Showing 13 changed files with 305 additions and 316 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [0.8.5] - 2018-05-21
### Added
- Example-1 (Comparison of three different classifiers)
- Example-2 (How to plot via matplotlib)
- JOSS paper
- ConfusionMatrix docstring

### Changed
- Table size in HTML report
- Test system
- README.md

## [0.8.1] - 2018-03-22
### Added
- Goodman and Kruskal's lambda B
Expand Down Expand Up @@ -136,7 +148,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- TPR
- documents and README.md

[Unreleased]: https://github.com/sepandhaghighi/pycm/compare/v0.8.1...HEAD
[Unreleased]: https://github.com/sepandhaghighi/pycm/compare/v0.8.5...HEAD
[0.8.5]: https://github.com/sepandhaghighi/pycm/compare/v0.8.1...v0.8.5
[0.8.1]: https://github.com/sepandhaghighi/pycm/compare/v0.7...v0.8.1
[0.7]: https://github.com/sepandhaghighi/pycm/compare/v0.6...v0.7
[0.6]: https://github.com/sepandhaghighi/pycm/compare/v0.5...v0.6
Expand Down
4 changes: 2 additions & 2 deletions Document/Document.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 0.8.1\n",
"### Version : 0.8.5\n",
"-----"
]
},
Expand Down Expand Up @@ -53,7 +53,7 @@
"metadata": {},
"source": [
"### Source Code\n",
"- Download [Version 0.8.1](https://github.com/sepandhaghighi/pycm/archive/v0.8.1.zip) or [Latest Source ](https://github.com/sepandhaghighi/pycm/archive/dev.zip)\n",
"- Download [Version 0.8.5](https://github.com/sepandhaghighi/pycm/archive/v0.8.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/pycm/archive/dev.zip)\n",
"- Run `pip install -r requirements.txt` or `pip3 install -r requirements.txt` (Need root access)\n",
"- Run `python3 setup.py install` or `python setup.py install` (Need root access)"
]
Expand Down
36 changes: 18 additions & 18 deletions Document/cm1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
<title>cm1</title>
</head>
<body>
<h1 style="border-bottom:1px solid black;text-align:center;">PYCM Report</h1><h2>Confusion Matrix : </h2>
<h1 style="border-bottom:1px solid black;text-align:center;">PyCM Report</h1><h2>Confusion Matrix : </h2>
<table>
<tr align="center">
<td>Actual</td>
<td>Predict
<table style="border:1px solid black;border-collapse: collapse;height:300px;width:300px;">
<table style="border:1px solid black;border-collapse: collapse;height:380px;width:380px;">
<tr align="center">
<td></td>
<td style="border:1px solid black;padding:10px;">0</td>
<td style="border:1px solid black;padding:10px;">1</td>
<td style="border:1px solid black;padding:10px;">2</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px;height:95px;width:95px;">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(105,105,105);color:white;padding:10px">10</td>
<td style="background-color: rgb(165,165,165);color:black;;padding:10px">6</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(105,105,105);color:white;padding:10px;height:95px;width:95px;">10</td>
<td style="background-color: rgb(165,165,165);color:black;;padding:10px;height:95px;width:95px;">6</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(26,26,26);color:white;padding:10px">9</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(26,26,26);color:white;padding:10px;height:95px;width:95px;">9</td>
</tr>
</table>
</td>
Expand Down Expand Up @@ -411,5 +411,5 @@ <h2>Class Statistics : </h2>
</tr>
</table>
</body>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PYCM</a> Version 0.8.1</p>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PyCM</a> Version 0.8.5</p>
</html>
36 changes: 18 additions & 18 deletions Document/cm2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
<title>cm2</title>
</head>
<body>
<h1 style="border-bottom:1px solid black;text-align:center;">PYCM Report</h1><h2>Confusion Matrix : </h2>
<h1 style="border-bottom:1px solid black;text-align:center;">PyCM Report</h1><h2>Confusion Matrix : </h2>
<table>
<tr align="center">
<td>Actual</td>
<td>Predict
<table style="border:1px solid black;border-collapse: collapse;height:300px;width:300px;">
<table style="border:1px solid black;border-collapse: collapse;height:380px;width:380px;">
<tr align="center">
<td></td>
<td style="border:1px solid black;padding:10px;">0</td>
<td style="border:1px solid black;padding:10px;">1</td>
<td style="border:1px solid black;padding:10px;">2</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px;height:95px;width:95px;">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(30,30,30);color:white;padding:10px">15</td>
<td style="background-color: rgb(240,240,240);color:black;;padding:10px">1</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(30,30,30);color:white;padding:10px;height:95px;width:95px;">15</td>
<td style="background-color: rgb(240,240,240);color:black;;padding:10px;height:95px;width:95px;">1</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(26,26,26);color:white;padding:10px">9</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(26,26,26);color:white;padding:10px;height:95px;width:95px;">9</td>
</tr>
</table>
</td>
Expand Down Expand Up @@ -411,5 +411,5 @@ <h2>Class Statistics : </h2>
</tr>
</table>
</body>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PYCM</a> Version 0.8.1</p>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PyCM</a> Version 0.8.5</p>
</html>
36 changes: 18 additions & 18 deletions Document/cm3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
<title>cm3</title>
</head>
<body>
<h1 style="border-bottom:1px solid black;text-align:center;">PYCM Report</h1><h2>Confusion Matrix : </h2>
<h1 style="border-bottom:1px solid black;text-align:center;">PyCM Report</h1><h2>Confusion Matrix : </h2>
<table>
<tr align="center">
<td>Actual</td>
<td>Predict
<table style="border:1px solid black;border-collapse: collapse;height:300px;width:300px;">
<table style="border:1px solid black;border-collapse: collapse;height:380px;width:380px;">
<tr align="center">
<td></td>
<td style="border:1px solid black;padding:10px;">0</td>
<td style="border:1px solid black;padding:10px;">1</td>
<td style="border:1px solid black;padding:10px;">2</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(19,19,19);color:white;padding:10px;height:95px;width:95px;">13</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(30,30,30);color:white;padding:10px">15</td>
<td style="background-color: rgb(240,240,240);color:black;;padding:10px">1</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">1</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(30,30,30);color:white;padding:10px;height:95px;width:95px;">15</td>
<td style="background-color: rgb(240,240,240);color:black;;padding:10px;height:95px;width:95px;">1</td>
</tr>
<tr align="center">
<td style="border:1px solid black;padding:10px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px">0</td>
<td style="background-color: rgb(179,179,179);color:black;;padding:10px">3</td>
<td style="background-color: rgb(102,102,102);color:white;padding:10px">6</td>
<td style="border:1px solid black;padding:10px;height:95px;width:95px;">2</td>
<td style="background-color: rgb(255,255,255);color:black;;padding:10px;height:95px;width:95px;">0</td>
<td style="background-color: rgb(179,179,179);color:black;;padding:10px;height:95px;width:95px;">3</td>
<td style="background-color: rgb(102,102,102);color:white;padding:10px;height:95px;width:95px;">6</td>
</tr>
</table>
</td>
Expand Down Expand Up @@ -411,5 +411,5 @@ <h2>Class Statistics : </h2>
</tr>
</table>
</body>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PYCM</a> Version 0.8.1</p>
<p style="text-align:center;position:absoloute;border-top:1px solid black;">Generated By <a href="http://pycm.shaghighi.ir" style="text-decoration:none;color:red;">PyCM</a> Version 0.8.5</p>
</html>
66 changes: 33 additions & 33 deletions Otherfiles/test.csv
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
Class,"100","200","500","600"
ACC,0.45,0.45,0.85,0.95
BM,None,0.125,0.27451,0.0
DOR,None,1.8,8.0,None
ERR,0.55,0.55,0.15,0.05
F0.5,0.0,0.68182,0.45455,0.0
F1,0.0,0.52174,0.4,0.0
F2,0.0,0.42254,0.35714,0.0
FDR,1.0,0.14286,0.5,None
FN,0,10,2,1
FNR,None,0.625,0.66667,1.0
FOR,0.0,0.76923,0.11111,0.05
FP,11,1,1,0
FPR,0.55,0.25,0.05882,0.0
G,None,0.56695,0.40825,None
LR+,None,1.5,5.66667,None
LR-,None,0.83333,0.70833,1.0
MCC,None,0.10483,0.32673,None
MK,0.0,0.08791,0.38889,None
N,20,4,17,19
NPV,1.0,0.23077,0.88889,0.95
P,0,16,3,1
POP,20,20,20,20
PPV,0.0,0.85714,0.5,None
PRE,0.0,0.8,0.15,0.05
RACC,0.0,0.28,0.015,0.0
RACCU,0.07563,0.33062,0.01562,0.00063
TN,9,3,16,19
TNR,0.45,0.75,0.94118,1.0
TON,9,13,18,20
TOP,11,7,2,0
TP,0,6,1,0
TPR,None,0.375,0.33333,0.0
Class,"0","1","2"
ACC,0.83333,0.75,0.58333
BM,0.77778,0.22222,0.16667
DOR,None,4.0,2.0
ERR,0.16667,0.25,0.41667
F0.5,0.65217,0.45455,0.57692
F1,0.75,0.4,0.54545
F2,0.88235,0.35714,0.51724
FDR,0.4,0.5,0.4
FN,0,2,3
FNR,0.0,0.66667,0.5
FOR,0.0,0.2,0.42857
FP,2,1,2
FPR,0.22222,0.11111,0.33333
G,0.7746,0.40825,0.54772
LR+,4.5,3.0,1.5
LR-,0.0,0.75,0.75
MCC,0.68313,0.2582,0.16903
MK,0.6,0.3,0.17143
N,9,9,6
NPV,1.0,0.8,0.57143
P,3,3,6
POP,12,12,12
PPV,0.6,0.5,0.6
PRE,0.25,0.25,0.5
RACC,0.10417,0.04167,0.20833
RACCU,0.11111,0.0434,0.21007
TN,7,8,4
TNR,0.77778,0.88889,0.66667
TON,7,10,7
TOP,5,2,5
TP,3,1,3
TPR,1.0,0.33333,0.5
Loading

0 comments on commit d784190

Please sign in to comment.