Skip to content

Commit e8b74f3

Browse files
committed
Release v0.1.4
1 parent 467d5a5 commit e8b74f3

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ml",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"main": [
55
"dist/ml.js",
66
"dist/ml.min.js"

dist/ml.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* ml - Machine learning tools
3-
* @version v0.1.3
3+
* @version v0.1.4
44
* @link https://github.com/mljs/ml
55
* @license MIT
66
*/
@@ -3798,13 +3798,13 @@ function SOM(x, y, options, reload) {
37983798

37993799
if (typeof this.options.fields === 'number') {
38003800
this.numWeights = this.options.fields;
3801-
this.extractor = null;
3802-
} else {
3803-
var fields = Object.keys(this.options.fields);
3804-
this.numWeights = fields.length;
3805-
var converters = getConverters(fields, this.options.fields);
3801+
} else if (Array.isArray(this.options.fields)) {
3802+
this.numWeights = this.options.fields.length;
3803+
var converters = getConverters(this.options.fields);
38063804
this.extractor = converters.extractor;
38073805
this.creator = converters.creator;
3806+
} else {
3807+
throw new Error('Invalid fields definition');
38083808
}
38093809

38103810
if (this.options.gridType === 'rect') {
@@ -3932,7 +3932,7 @@ SOM.prototype.setTraining = function setTraining(trainingSet) {
39323932
var convertedSet = trainingSet;
39333933
var i, l = trainingSet.length;
39343934
if (this.extractor) {
3935-
convertedSet = new Array(trainingSet);
3935+
convertedSet = new Array(l);
39363936
for (i = 0; i < l; i++) {
39373937
convertedSet[i] = this.extractor(trainingSet[i]);
39383938
}
@@ -4125,26 +4125,26 @@ SOM.prototype.getFit = function getFit(dataset) {
41254125
return result;
41264126
};
41274127

4128-
function getConverters(fields, fieldsOpt) {
4128+
function getConverters(fields) {
41294129
var l = fields.length,
41304130
normalizers = new Array(l),
41314131
denormalizers = new Array(l);
41324132
for (var i = 0; i < l; i++) {
4133-
normalizers[i] = getNormalizer(fieldsOpt[fields[i]]);
4134-
denormalizers[i] = getDenormalizer(fieldsOpt[fields[i]]);
4133+
normalizers[i] = getNormalizer(fields[i].range);
4134+
denormalizers[i] = getDenormalizer(fields[i].range);
41354135
}
41364136
return {
41374137
extractor: function extractor(value) {
41384138
var result = new Array(l);
41394139
for (var i = 0; i < l; i++) {
4140-
result[i] = normalizers[i](value[fields[i]]);
4140+
result[i] = normalizers[i](value[fields[i].name]);
41414141
}
41424142
return result;
41434143
},
41444144
creator: function creator(value) {
41454145
var result = {};
41464146
for (var i = 0; i < l; i++) {
4147-
result[fields[i]] = denormalizers[i](value[i]);
4147+
result[fields[i].name] = denormalizers[i](value[i]);
41484148
}
41494149
return result;
41504150
}

dist/ml.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ml",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"description": "Machine learning tools",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)