Mercurial > repos > bimib > marea
diff Marea/marea.py @ 61:69dfed656e0b draft
Uploaded
| author | bimib |
|---|---|
| date | Sun, 15 Mar 2020 12:26:26 -0400 |
| parents | 68375ead0ee4 |
| children | 53b4fca5bdf9 |
line wrap: on
line diff
--- a/Marea/marea.py Sun Mar 15 12:04:49 2020 -0400 +++ b/Marea/marea.py Sun Mar 15 12:26:26 2020 -0400 @@ -636,7 +636,6 @@ if comparison == "manyvsmany": for i, j in it.combinations(class_pat.keys(), 2): - tmp = {} count = 0 max_F_C = 0 @@ -672,10 +671,6 @@ renderPDF.drawToFile(svg2rlg(file_svg), file_pdf) if not create_svg: - #Ho utilizzato il file svg per generare il pdf, - #ma l'utente non ne ha richiesto il ritorno, quindi - #lo elimino - os.remove('result/' + i + '_vs_' + j + ' (SVG Map).svg') elif comparison == "onevsrest": for single_cluster in class_pat.keys(): @@ -726,6 +721,10 @@ elif comparison == "onevsmany": for i, j in it.combinations(class_pat.keys(), 2): + if i != control and j != control: + continue + if i == control and j == control: + continue tmp = {} count = 0 max_F_C = 0 @@ -761,10 +760,6 @@ renderPDF.drawToFile(svg2rlg(file_svg), file_pdf) if not create_svg: - #Ho utilizzato il file svg per generare il pdf, - #ma l'utente non ne ha richiesto il ritorno, quindi - #lo elimino - os.remove('result/' + i + '_vs_' + j + ' (SVG Map).svg')