nlptoolkit-classification 1.0.6 → 1.0.8

package/source/Model/LdaModel.ts

@@ -1,62 +0,0 @@
-import {GaussianModel} from "./GaussianModel";
-import {Vector} from "nlptoolkit-math/dist/Vector";
-import {DiscreteDistribution} from "nlptoolkit-math/dist/DiscreteDistribution";
-import {Instance} from "../Instance/Instance";
-import {FileContents} from "nlptoolkit-util/dist/FileContents";
-
-export class LdaModel extends GaussianModel{
-
-    protected w0: Map<string, number>
-    protected w: Map<string, Vector>
-
-    /**
-     * A constructor which sets the priorDistribution, w and w0 according to given inputs.
-     *
-     * @param priorDistributionOrFileName {@link DiscreteDistribution} input.
-     * @param w                 {@link HashMap} of String and Vectors.
-     * @param w0                {@link HashMap} of String and Double.
-     */
-    constructor(priorDistributionOrFileName?: DiscreteDistribution | string, w?: Map<string, Vector>, w0?: Map<string, number>) {
-        super()
-        if (priorDistributionOrFileName instanceof DiscreteDistribution){
-            this.priorDistribution = priorDistributionOrFileName
-            this.w = w
-            this.w0 = w0
-        } else {
-            if (priorDistributionOrFileName != undefined){
-                let input = new FileContents(priorDistributionOrFileName)
-                let size = this.loadPriorDistribution(input)
-                this.loadWandW0(input, size)
-            }
-        }
-    }
-
-    /**
-     * The calculateMetric method takes an {@link Instance} and a String as inputs. It returns the dot product of given Instance
-     * and wi plus w0i.
-     *
-     * @param instance {@link Instance} input.
-     * @param Ci       String input.
-     * @return The dot product of given Instance and wi plus w0i.
-     */
-    calculateMetric(instance: Instance, Ci: string): number {
-        let xi = instance.toVector();
-        let wi = this.w.get(Ci);
-        let w0i = this.w0.get(Ci);
-        return wi.dotProduct(xi) + w0i;
-    }
-
-    loadWandW0(input: FileContents, size: number){
-        this.w0 = new Map<string, number>()
-        for (let i = 0; i < size; i++){
-            let line = input.readLine()
-            let items = line.split(" ")
-            this.w0.set(items[0], parseFloat(items[1]))
-        }
-        this.w = this.loadVectors(input, size)
-    }
-
-    saveTxt(fileName: string){
-    }
-
-}

package/source/Model/LinearPerceptronModel.ts

@@ -1,83 +0,0 @@
-import {NeuralNetworkModel} from "./NeuralNetworkModel";
-import {Matrix} from "nlptoolkit-math/dist/Matrix";
-import {InstanceList} from "../InstanceList/InstanceList";
-import {LinearPerceptronParameter} from "../Parameter/LinearPerceptronParameter";
-import {ClassificationPerformance} from "../Performance/ClassificationPerformance";
-import {Random} from "nlptoolkit-util/dist/Random";
-import {FileContents} from "nlptoolkit-util/dist/FileContents";
-
-export class LinearPerceptronModel extends NeuralNetworkModel{
-
-    protected W: Matrix
-
-    constructor1(trainSet: InstanceList, validationSet?: InstanceList, parameters?: LinearPerceptronParameter){
-        if (validationSet != undefined){
-            this.W = this.allocateLayerWeights(this.K, this.d + 1, new Random(parameters.getSeed()));
-            let bestW = this.W.clone();
-            let bestClassificationPerformance = new ClassificationPerformance(0.0)
-            let epoch = parameters.getEpoch()
-            let learningRate = parameters.getLearningRate()
-            for (let i = 0; i < epoch; i++) {
-                trainSet.shuffle(new Random(parameters.getSeed()))
-                for (let j = 0; j < trainSet.size(); j++) {
-                    this.createInputVector(trainSet.get(j))
-                    let rMinusY = this.calculateRMinusY(trainSet.get(j), this.x, this.W)
-                    let deltaW = new Matrix(rMinusY, this.x);
-                    deltaW.multiplyWithConstant(learningRate);
-                    this.W.add(deltaW)
-                }
-                let currentClassificationPerformance = this.testClassifier(validationSet)
-                if (currentClassificationPerformance.getAccuracy() > bestClassificationPerformance.getAccuracy()) {
-                    bestClassificationPerformance = currentClassificationPerformance
-                    bestW = this.W.clone()
-                }
-                learningRate *= parameters.getEtaDecrease()
-            }
-            this.W = bestW
-        }
-    }
-
-    constructor2(fileName: string){
-        let input = new FileContents(fileName)
-        this.loadClassLabels(input)
-        this.W = this.loadMatrix(input)
-    }
-
-    /**
-     * Constructor that takes {@link InstanceList}s as trainsSet and validationSet. Initially it allocates layer weights,
-     * then creates an input vector by using given trainSet and finds error. Via the validationSet it finds the classification
-     * performance and at the end it reassigns the allocated weight Matrix with the matrix that has the best accuracy.
-     *
-     * @param trainSetOrFileName      InstanceList that is used to train.
-     * @param validationSet InstanceList that is used to validate.
-     * @param parameters    Linear perceptron parameters; learningRate, etaDecrease, crossValidationRatio, epoch.
-     */
-    constructor(trainSetOrFileName?: InstanceList | string, validationSet?: InstanceList, parameters?: LinearPerceptronParameter) {
-        if (trainSetOrFileName instanceof InstanceList){
-            if (validationSet != undefined){
-                super(trainSetOrFileName)
-                this.constructor1(trainSetOrFileName, validationSet, parameters)
-            } else {
-                super(trainSetOrFileName)
-            }
-        } else {
-            if (trainSetOrFileName != undefined){
-                super()
-                this.constructor2(trainSetOrFileName)
-            } else {
-                super()
-            }
-        }
-    }
-
-    /**
-     * The calculateOutput method calculates the {@link Matrix} y by multiplying Matrix W with {@link Vector} x.
-     */
-    protected calculateOutput(): void {
-        this.y = this.W.multiplyWithVectorFromRight(this.x);
-    }
-
-    saveTxt(fileName: string){
-    }
-
-}

package/source/Model/QdaModel.ts

@@ -1,57 +0,0 @@
-import {LdaModel} from "./LdaModel";
-import {Matrix} from "nlptoolkit-math/dist/Matrix";
-import {DiscreteDistribution} from "nlptoolkit-math/dist/DiscreteDistribution";
-import {Vector} from "nlptoolkit-math/dist/Vector";
-import {Instance} from "../Instance/Instance";
-import {FileContents} from "nlptoolkit-util/dist/FileContents";
-
-export class QdaModel extends LdaModel{
-
-    private W: Map<string, Matrix>
-
-    /**
-     * The constructor which sets the priorDistribution, w w1 and HashMap of String Matrix.
-     *
-     * @param priorDistributionOrFileName {@link DiscreteDistribution} input.
-     * @param W                 {@link HashMap} of String and Matrix.
-     * @param w                 {@link HashMap} of String and Vectors.
-     * @param w0                {@link HashMap} of String and Double.
-     */
-    constructor(priorDistributionOrFileName: DiscreteDistribution | string, W?: Map<string, Matrix>, w?: Map<string, Vector>, w0?: Map<string, number>) {
-        if (priorDistributionOrFileName instanceof DiscreteDistribution){
-            super(priorDistributionOrFileName, w, w0);
-            this.W = W
-        } else {
-            super()
-            let input = new FileContents(priorDistributionOrFileName)
-            let size = this.loadPriorDistribution(input)
-            this.loadWandW0(input, size)
-            this.W = new Map<string, Matrix>()
-            for (let i = 0; i < size; i++){
-                let c = input.readLine()
-                let matrix = this.loadMatrix(input)
-                this.W.set(c, matrix)
-            }
-        }
-    }
-
-    /**
-     * The calculateMetric method takes an {@link Instance} and a String as inputs. It multiplies Matrix Wi with Vector xi
-     * then calculates the dot product of it with xi. Then, again it finds the dot product of wi and xi and returns the summation with w0i.
-     *
-     * @param instance {@link Instance} input.
-     * @param Ci       String input.
-     * @return The result of Wi.multiplyWithVectorFromLeft(xi).dotProduct(xi) + wi.dotProduct(xi) + w0i.
-     */
-    calculateMetric(instance: Instance, Ci: string): number {
-        let xi = instance.toVector();
-        let Wi = this.W.get(Ci);
-        let wi = this.w.get(Ci);
-        let w0i = this.w0.get(Ci);
-        return Wi.multiplyWithVectorFromLeft(xi).dotProduct(xi) + wi.dotProduct(xi) + w0i;
-    }
-
-    saveTxt(fileName: string){
-    }
-
-}