rename files and separate into class files

index.js

@@ -1 +1 @@
-module.exports = require('./lib/kmeans');
+module.exports = require('./lib/KMeansEngine');

lib/Cluster.js

@@ -0,0 +1,36 @@
+const _ = require('underscore');
+const Vector = require('./Vector');
+
+class Cluster {
+  constructor(centroid) {
+    this.centroid = centroid;
+
+    this.init();
+  }
+
+  init() {
+    this.hasMoved = false;
+    this.vectorIds = [];
+  }
+
+  addVectorId(id) {
+    this.vectorIds.push(id);
+  }
+
+  calculateCentroids(allVectors) {
+    const newCentroid = new Vector();
+
+    this.vectorIds.map(id => allVectors[id]).forEach((vector) => {
+      newCentroid.add(vector);
+    });
+
+    newCentroid.divide(this.vectorIds.length);
+
+    if (!_.isEqual(this.centroid.getObject(), newCentroid.getObject())) {
+      this.centroid = newCentroid;
+      this.hasMoved = true;
+    }
+  }
+}
+
+module.exports = Cluster;

lib/kmeans.js → lib/KMeansEngine.js

@@ -1,109 +1,8 @@
 const _ = require('underscore');
+const Vector = require('./Vector');
+const Cluster = require('./Cluster');
 
-class Vector {
-  constructor(vector) {
-    this.vector = vector || {};
-  }
-
-  clone() {
-    return new Vector(Object.assign({}, this.getObject()));
-  }
-
-  getKeys() {
-    return Object.keys(this.vector);
-  }
-
-  getObject() {
-    return this.vector;
-  }
-
-  getEuclideanDistance(vector) {
-    const tmpVector = this.clone().subtract(vector);
-    const tmp = tmpVector.getObject();
-    let d = 0;
-
-    tmpVector.getKeys().forEach((k) => {
-      // only need to consider the overlapping keys
-      d += tmp[k] * tmp[k];
-    });
-
-    return Math.sqrt(d);
-  }
-
-  add(vector) {
-    const tmp = vector.getObject();
-
-    vector.getKeys().forEach((k) => {
-      if (this.vector[k] === undefined) { this.vector[k] = 0; }
-
-      this.vector[k] += tmp[k];
-    });
-
-    return this;
-  }
-
-  subtract(vector) {
-    const tmp = vector.getObject();
-
-    vector.getKeys().forEach((k) => {
-      if (this.vector[k] === undefined) { this.vector[k] = 0; }
-
-      this.vector[k] -= tmp[k];
-    });
-
-    return this;
-  }
-
-  multiply(c) {
-    this.getKeys().forEach((k) => {
-      this.vector[k] *= c;
-    });
-
-    return this;
-  }
-
-  divide(c) {
-    this.getKeys().forEach((k) => {
-      this.vector[k] /= c;
-    });
-
-    return this;
-  }
-}
-
-class Cluster {
-  constructor(centroid) {
-    this.centroid = centroid;
-
-    this.init();
-  }
-
-  init() {
-    this.hasMoved = false;
-    this.vectorIds = [];
-  }
-
-  addVectorId(id) {
-    this.vectorIds.push(id);
-  }
-
-  calculateCentroids(allVectors) {
-    const newCentroid = new Vector();
-
-    this.vectorIds.map(id => allVectors[id]).forEach((vector) => {
-      newCentroid.add(vector);
-    });
-
-    newCentroid.divide(this.vectorIds.length);
-
-    if (!_.isEqual(this.centroid.getObject(), newCentroid.getObject())) {
-      this.centroid = newCentroid;
-      this.hasMoved = true;
-    }
-  }
-}
-
-class KMeanEngine {
+class KMeansEngine {
   constructor(vectors, k, callback) {
     this.vectors = [];
     vectors.forEach((v) => {
@@ -142,7 +41,7 @@ class KMeanEngine {
     this.iterations = 0;
     this.clusters = [];
 
-    const randNums = KMeanEngine.getRandomSequence(0, this.vectors.length - 1, this.k);
+    const randNums = KMeansEngine.getRandomSequence(0, this.vectors.length - 1, this.k);
 
     // randomly pick a vector to be the centroid
     for (let i = 0; i < this.k; i += 1) {
@@ -234,6 +133,6 @@ class KMeanEngine {
 }
 
 exports.clusterize = (vectors, k, callback) => {
-  const kmeans = new KMeanEngine(vectors, k, callback);
+  const kmeans = new KMeansEngine(vectors, k, callback);
   return kmeans.clusterize();
 };

lib/Vector.js

@@ -0,0 +1,72 @@
+class Vector {
+  constructor(vector) {
+    this.vector = vector || {};
+  }
+
+  clone() {
+    return new Vector(Object.assign({}, this.getObject()));
+  }
+
+  getKeys() {
+    return Object.keys(this.vector);
+  }
+
+  getObject() {
+    return this.vector;
+  }
+
+  getEuclideanDistance(vector) {
+    const tmpVector = this.clone().subtract(vector);
+    const tmp = tmpVector.getObject();
+    let d = 0;
+
+    tmpVector.getKeys().forEach((k) => {
+      // only need to consider the overlapping keys
+      d += tmp[k] * tmp[k];
+    });
+
+    return Math.sqrt(d);
+  }
+
+  add(vector) {
+    const tmp = vector.getObject();
+
+    vector.getKeys().forEach((k) => {
+      if (this.vector[k] === undefined) { this.vector[k] = 0; }
+
+      this.vector[k] += tmp[k];
+    });
+
+    return this;
+  }
+
+  subtract(vector) {
+    const tmp = vector.getObject();
+
+    vector.getKeys().forEach((k) => {
+      if (this.vector[k] === undefined) { this.vector[k] = 0; }
+
+      this.vector[k] -= tmp[k];
+    });
+
+    return this;
+  }
+
+  multiply(c) {
+    this.getKeys().forEach((k) => {
+      this.vector[k] *= c;
+    });
+
+    return this;
+  }
+
+  divide(c) {
+    this.getKeys().forEach((k) => {
+      this.vector[k] /= c;
+    });
+
+    return this;
+  }
+}
+
+module.exports = Vector;

test/index.js

@@ -1,9 +1,5 @@
-
-
 const chai = require('chai');
-
 const should = chai.should();
-
 const kmeans = require('../');
 
 const set1 = require('../fixtures/engineers');