Skip to content

Commit

Permalink
v1.15.3, fixed category updating bugs, compatible with dendro_cats
Browse files Browse the repository at this point in the history
  • Loading branch information
@cornhundred
cornhundred committed Mar 16, 2017
1 parent 00462fd commit dd4cca7
Show file tree
Hide file tree
Showing 10 changed files with 3,508 additions and 3,607 deletions.
2,815 changes: 1,406 additions & 1,409 deletions clustergrammer.js
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions clustergrammer.min.js
View file

Large diffs are not rendered by default.

3,018 changes: 1,640 additions & 1,378 deletions clustergrammer.node.js
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions clustergrammer.node.min.js
View file

Large diffs are not rendered by default.

1,054 changes: 348 additions & 706 deletions json/mult_view.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion json/mult_view_sim_row.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions make_clustergrammer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
# net.swap_nan_for_zero()
# net.set_cat_color('col', 1, 'Category: one', 'blue')

net.make_clust()
net.dendro_cats('row', 5)
# net.make_clust()
# net.dendro_cats('row', 5)

net.make_clust(dist_type='cos',views=['N_row_sum', 'N_row_var'] , dendro=True,
sim_mat=True, filter_sim=0.1, calc_cat_pval=False)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clustergrammer",
"version": "v1.15.2",
"version": "v1.15.3",
"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: 1 addition & 1 deletion src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var awesomplete = require('awesomplete');
require('!style!css!./d3.slider/d3.slider.css');
require('!style!css!awesomplete/awesomplete.css');

/* clustergrammer v1.15.2
/* clustergrammer v1.15.3
* Nick Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2017
*/
Expand Down
186 changes: 93 additions & 93 deletions webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,97 +33,97 @@ module.exports = [
]
}
},
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.min.js',
// libraryTarget: 'var',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.min.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// }
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.min.js',
libraryTarget: 'var',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.min.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
}
];

0 comments on commit dd4cca7

Please sign in to comment.