nlptoolkit-classification 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nlptoolkit-classification",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Classification Library",
   "main": "index.js",
   "types": "index.js",

package/source/Model/DecisionTree/DecisionNode.ts

@@ -20,6 +20,7 @@ export class DecisionNode {
     private classLabel : string = undefined
     leaf: boolean = false
     private condition: DecisionCondition = undefined
+    private classLabelsDistribution: DiscreteDistribution
 
     constructor1(data: InstanceList, condition?: DecisionCondition | number, parameter?: RandomForestParameter, isStump?: boolean){
         let bestAttribute = -1
@@ -27,8 +28,13 @@ export class DecisionNode {
         if (condition instanceof DecisionCondition){
             this.condition = condition;
         }
-        this.data = data;
-        this.classLabel = Model.getMaximum(data.getClassLabels());
+        this.data = data
+        this.classLabelsDistribution = new DiscreteDistribution()
+        let labels = data.getClassLabels()
+        for (let label of labels){
+            this.classLabelsDistribution.addItem(label)
+        }
+        this.classLabel = Model.getMaximum(labels)
         this.leaf = true;
         let classLabels = data.getDistinctClassLabels();
         if (classLabels.length == 1) {
@@ -144,6 +150,7 @@ export class DecisionNode {
         } else {
             this.leaf = true
             this.classLabel = contents.readLine()
+            this.classLabelsDistribution = Model.loadDiscreteDistribution(contents);
         }
     }
 
@@ -288,7 +295,7 @@ export class DecisionNode {
 
     predictProbabilityDistribution(instance: Instance): Map<string, number>{
         if (this.leaf) {
-            return this.data.classDistribution().getProbabilityDistribution();
+            return this.classLabelsDistribution.getProbabilityDistribution();
         } else {
             for (let node of this.children) {
                 if (node.condition.satisfy(instance)) {

package/source/Model/DecisionTree/DecisionTree.ts

@@ -3,7 +3,6 @@ import {DecisionNode} from "./DecisionNode";
 import {Instance} from "../../Instance/Instance";
 import {CompositeInstance} from "../../Instance/CompositeInstance";
 import {InstanceList} from "../../InstanceList/InstanceList";
-import * as fs from "fs";
 import {FileContents} from "nlptoolkit-util/dist/FileContents";
 
 export class DecisionTree extends ValidatedModel{

package/source/Model/DeepNetworkModel.ts

@@ -125,13 +125,13 @@ export class DeepNetworkModel extends NeuralNetworkModel{
 
     constructor2(fileName: string){
         let input = new FileContents(fileName)
-        this.activationFunction = this.loadActivationFunction(input)
         this.loadClassLabels(input)
         this.hiddenLayerSize = parseInt(input.readLine())
         this.weights = new Array<Matrix>()
         for (let i = 0; i < this.hiddenLayerSize + 1; i++){
             this.weights.push(this.loadMatrix(input))
         }
+        this.activationFunction = this.loadActivationFunction(input)
     }
 
     /**

package/source/Model/DummyModel.ts

@@ -20,16 +20,7 @@ export class DummyModel extends Model{
             this.distribution = trainSet.classDistribution();
         } else {
             let input = new FileContents(trainSet)
-            this.distribution = new DiscreteDistribution()
-            let size = parseInt(input.readLine())
-            for (let i = 0; i < size; i++){
-                let line = input.readLine()
-                let items = line.split(" ")
-                let count = parseInt(items[1])
-                for (let j = 0; j < count; j++){
-                    this.distribution.addItem(items[0])
-                }
-            }
+            this.distribution = Model.loadDiscreteDistribution(input)
         }
     }
 

package/source/Model/Model.ts

@@ -3,6 +3,7 @@ import {CounterHashMap} from "nlptoolkit-datastructure/dist/CounterHashMap";
 import {FileContents} from "nlptoolkit-util/dist/FileContents";
 import {InstanceList} from "../InstanceList/InstanceList";
 import {Matrix} from "nlptoolkit-math/dist/Matrix";
+import {DiscreteDistribution} from "nlptoolkit-math/dist/DiscreteDistribution";
 
 export abstract class Model {
 
@@ -40,6 +41,20 @@ export abstract class Model {
         return instance
     }
 
+    static loadDiscreteDistribution(input: FileContents): DiscreteDistribution{
+        let distribution = new DiscreteDistribution()
+        let size = parseInt(input.readLine())
+        for (let i = 0; i < size; i++){
+            let line = input.readLine()
+            let items = line.split(" ")
+            let count = parseInt(items[1])
+            for (let j = 0; j < count; j++){
+                distribution.addItem(items[0])
+            }
+        }
+        return distribution
+    }
+
     loadInstanceList(input: FileContents): InstanceList{
         let types = input.readLine().split(" ")
         let instanceCount = parseInt(input.readLine())

package/source/Model/MultiLayerPerceptronModel.ts

@@ -80,10 +80,10 @@ export class MultiLayerPerceptronModel extends LinearPerceptronModel{
 
     constructor2(fileName: string){
         let input = new FileContents(fileName)
-        this.activationFunction = this.loadActivationFunction(input)
         this.loadClassLabels(input)
         this.W = this.loadMatrix(input)
         this.V = this.loadMatrix(input)
+        this.activationFunction = this.loadActivationFunction(input)
     }
 
     /**