derekovecs: show association measures also for direct neighbours
diff --git a/templates/index.html.ep b/templates/index.html.ep
index 9b6f69c..019f3a5 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -193,21 +193,25 @@
"dom": '<"top">rt<"bottom"flp><"clear">',
"columns": [
// { "data": "pos", width: "7%", sClass: "dt-center mono compact", render: function ( data, type, row ) {return bitvec2window(data, row.heat, row.word) }},
- { "data": "llr", render: function ( data, type, row ) {return data.toFixed(3) }},
- { "data": "lfmd", render: function ( data, type, row ) {return data.toFixed(3) }},
- { "data": "fpmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(3) } },
- { "data": "npmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(3) } },
+ { "data": "llr", render: function ( data, type, row ) {return data.toFixed(1) }},
+ { "data": "lfmd", render: function ( data, type, row ) {return data.toFixed(2) }},
+// { "data": "fpmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(2) } },
+ { "data": "npmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(2) } },
+ { "data": "llfmd", render: function ( data, type, row ) {return data.toFixed(2) }},
+ { "data": "rlfmd", render: function ( data, type, row ) {return data.toFixed(2) }},
+ { "data": "lnpmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(2) } },
+ { "data": "rnpmi", type: "scientific", render: function ( data, type, row ) {return data.toExponential(2) } },
{ "data": "word", sClass: "collocator" }
],
"columnDefs": [
- { className: "dt-right", "targets": [0,1,2,3] },
+ { className: "dt-right", "targets": [0,1,2,3,4,5,6] },
{ "searchable": false,
"orderable": false,
"targets": []
},
- { "type": "scientific", targets: [2,3] },
- { "orderSequence": [ "desc" ], "targets": [ 0, 1, 2, 3 ] },
- { "orderSequence": [ "asc", "desc" ], "targets": [ 4 ] },
+ { "type": "scientific", targets: [2,3,4,5,6] },
+ { "orderSequence": [ "desc" ], "targets": [ 0, 1, 2, 3,4,5,6 ] },
+ { "orderSequence": [ "asc", "desc" ], "targets": [ 7 ] },
],
"oLanguage": {
"sSearch": "Filter: "
@@ -896,8 +900,8 @@
<div id="sominfo1"><span id="somcolor1"> </span> <span id="somword1"> </span> <span id="somcolor2"> </span> <span id="somword2"> </span> <span id="somcolor3"> </span></div>
<div id="sominfo">SOM iteration <span id="iterations">0</span></div>
</div>
- <div id="tabs-3" style="width:1300px">
- <div style="width: 60%; float: left;" id="secondt">
+ <div id="tabs-3" style="width:1500px">
+ <div style="width: 55%; float: left;" id="secondt">
<table class="display compact nowrap" id="secondtable">
<thead>
<tr>
@@ -931,14 +935,18 @@
</tbody>
</table>
</div>
- <div style="margin-left:20px; float:right; width: 500px">
+ <div style="margin-left:20px; float:right; width: 650px">
<table class="display compact nowrap" id="classicoloctable">
<thead>
<tr>
<th>llr</th>
<th title="log-frequency biased mutual dependency">lfmd</th>
- <th title="frequency biased pointwise mutual information">fpmi</th>
+ <!-- <th title="frequency biased pointwise mutual information">fpmi</th>-->
<th title="normalized pointwise mutual information">npmi</th>
+ <th title="log-frequency biased mutual dependency - left neighbour only">l-lfmd</th>
+ <th title="log-frequency biased mutual dependency - right neighbour only">r-lfmd</th>
+ <th title="normalized pointwise mutual information - left neighbour only">l-npmi</th>
+ <th title="normalized pointwise mutual information - right neighbour only">r-npmi</th>
<th>collocator</th>
</tr>
</thead>
@@ -952,6 +960,14 @@
</td>
<td align="right">
</td>
+ <td align="right">
+ </td>
+ <td align="right">
+ </td>
+ <td align="right">
+ </td>
+ <td align="right">
+ </td>
</tr>
</tbody>
</table>