Skip to content

Commit

Permalink
fixed eslint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
cornhundred committed Aug 13, 2017
1 parent 36621ea commit b6cc42c
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 27 deletions.
12 changes: 4 additions & 8 deletions clustergrammer.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var Clustergrammer =
__webpack_require__(225);
__webpack_require__(229);

/* clustergrammer v1.19.1
/* clustergrammer v1.19.2
* Nicolas Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2017
*/
Expand Down Expand Up @@ -1988,7 +1988,7 @@ var Clustergrammer =

if (_.has(params.network_data, 'cat_colors') && predefined_cat_colors === true) {
viz.cat_colors[inst_rc] = params.network_data.cat_colors[inst_rc];
} else {}
}

if (params.sim_mat) {
// sending row color info to columns since row color info can be updated
Expand Down Expand Up @@ -4551,8 +4551,6 @@ var Clustergrammer =
inst_title = inst_title.slice(0, max_string_length) + '..';
}

console.log(inst_title);

// make title
cat_graph_group.append('text').classed('cat_graph_title', true).text(inst_title).style('font-family', '"Helvetica Neue", Helvetica, Arial, sans-serif').style('font-weight', 800);

Expand Down Expand Up @@ -4670,10 +4668,6 @@ var Clustergrammer =
inst_count = parseFloat(inst_count.toPrecision(2));
}

// inst_count = Math.round(inst_count * 1000)/1000;
// console.log(inst_count)
// console.log(inst_count.toPrecision(3))

// inst_count = inst_count.toLocaleString();
return inst_count;
}).attr('transform', function () {
Expand Down Expand Up @@ -4958,6 +4952,7 @@ var Clustergrammer =
module.exports = function binom_test(actual_k, n, p) {

var fact = math.factorial;
var pval;

function binom_dist(k, n, p) {
var bin_coeff = fact(n) / (fact(k) * fact(n - k));
Expand All @@ -4968,6 +4963,7 @@ var Clustergrammer =
function my_binom_test_2(actual_k, n, p) {
var cp = 0;
var k;
var dp;
for (var inst_k = actual_k; inst_k < n + 1; inst_k++) {
k = inst_k;
dp = binom_dist(k, n, p);
Expand Down
2 changes: 1 addition & 1 deletion clustergrammer.min.js

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions clustergrammer.node.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ module.exports =
__webpack_require__(226);
__webpack_require__(230);

/* clustergrammer v1.19.1
/* clustergrammer v1.19.2
* Nicolas Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2017
*/
Expand Down Expand Up @@ -2061,7 +2061,7 @@ module.exports =

if (_.has(params.network_data, 'cat_colors') && predefined_cat_colors === true) {
viz.cat_colors[inst_rc] = params.network_data.cat_colors[inst_rc];
} else {}
}

if (params.sim_mat) {
// sending row color info to columns since row color info can be updated
Expand Down Expand Up @@ -4708,8 +4708,6 @@ module.exports =
inst_title = inst_title.slice(0, max_string_length) + '..';
}

console.log(inst_title);

// make title
cat_graph_group.append('text').classed('cat_graph_title', true).text(inst_title).style('font-family', '"Helvetica Neue", Helvetica, Arial, sans-serif').style('font-weight', 800);

Expand Down Expand Up @@ -4827,10 +4825,6 @@ module.exports =
inst_count = parseFloat(inst_count.toPrecision(2));
}

// inst_count = Math.round(inst_count * 1000)/1000;
// console.log(inst_count)
// console.log(inst_count.toPrecision(3))

// inst_count = inst_count.toLocaleString();
return inst_count;
}).attr('transform', function () {
Expand Down Expand Up @@ -5118,6 +5112,7 @@ module.exports =
module.exports = function binom_test(actual_k, n, p) {

var fact = math.factorial;
var pval;

function binom_dist(k, n, p) {
var bin_coeff = fact(n) / (fact(k) * fact(n - k));
Expand All @@ -5128,6 +5123,7 @@ module.exports =
function my_binom_test_2(actual_k, n, p) {
var cp = 0;
var k;
var dp;
for (var inst_k = actual_k; inst_k < n + 1; inst_k++) {
k = inst_k;
dp = binom_dist(k, n, p);
Expand Down
2 changes: 1 addition & 1 deletion clustergrammer.node.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clustergrammer",
"version": "v1.19.1",
"version": "v1.19.2",
"description": "This is a clustergram implemented in D3.js. I started from the example http://bost.ocks.org/mike/miserables/ and added the following features",
"main": "clustergrammer.node.js",
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions src/dendrogram/binom_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ math.import(require('mathjs/lib/function/probability/factorial'));
module.exports = function binom_test(actual_k, n, p){

var fact = math.factorial;
var pval;

function binom_dist(k, n, p){
var bin_coeff = (fact(n))/( fact(k) * fact(n-k) );
Expand All @@ -23,6 +24,7 @@ module.exports = function binom_test(actual_k, n, p){
function my_binom_test_2(actual_k, n, p){
var cp = 0;
var k;
var dp;
for (var inst_k=actual_k; inst_k < n+1; inst_k++ ){
k = inst_k;
dp = binom_dist(k, n, p);
Expand Down
6 changes: 0 additions & 6 deletions src/dendrogram/make_cat_breakdown_graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ module.exports = function make_cat_breakdown_graph(params, inst_rc, inst_data, d
inst_title = inst_title.slice(0, max_string_length) + '..';
}

console.log(inst_title)

// make title
cat_graph_group
.append('text')
Expand Down Expand Up @@ -318,10 +316,6 @@ module.exports = function make_cat_breakdown_graph(params, inst_rc, inst_data, d
inst_count = parseFloat(inst_count.toPrecision(2))
}

// inst_count = Math.round(inst_count * 1000)/1000;
// console.log(inst_count)
// console.log(inst_count.toPrecision(3))

// inst_count = inst_count.toLocaleString();
return inst_count;
})
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var awesomplete = require('awesomplete');
require('!style!css!./d3.slider/d3.slider.css');
require('!style!css!awesomplete/awesomplete.css');

/* clustergrammer v1.19.1
/* clustergrammer v1.19.2
* Nicolas Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2017
*/
Expand Down
1 change: 0 additions & 1 deletion src/params/make_cat_params.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ module.exports = function make_cat_params(params, viz, predefined_cat_colors=tru

if (_.has(params.network_data, 'cat_colors') && predefined_cat_colors === true){
viz.cat_colors[inst_rc] = params.network_data.cat_colors[inst_rc];
} else {
}

if (params.sim_mat){
Expand Down

0 comments on commit b6cc42c

Please sign in to comment.