nlptoolkit-classification 1.0.6 → 1.0.8

package/README.md

@@ -55,6 +55,7 @@ You can also see [Java](https://github.com/starlangsoftware/Classification),
 [Cython](https://github.com/starlangsoftware/Classification-Cy), 
 [Swift](https://github.com/starlangsoftware/Classification-Swift),
 [C++](https://github.com/starlangsoftware/Classification-CPP),
+[C](https://github.com/starlangsoftware/Classification-C),
 or [C#](https://github.com/starlangsoftware/Classification-CS) repository.
 
 ## Requirements

package/dist/Attribute/DiscreteAttribute.d.ts

@@ -1,6 +1,6 @@
 import { Attribute } from "./Attribute";
 export declare class DiscreteAttribute extends Attribute {
-    private value;
+    private readonly value;
     /**
      * Constructor for a discrete attribute.
      *

package/dist/Attribute/DiscreteAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscreteAttribute.js","sourceRoot":"","sources":["../../source/Attribute/DiscreteAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,2CAAsC;IAEtC,MAAa,iBAAkB,SAAQ,qBAAS;QAI5C;;;;WAIG;QACH,YAAY,KAAa;YACrB,KAAK,EAAE,CAAC;YARJ,UAAK,GAAW,MAAM,CAAA;YAS1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QACtB,CAAC;QAED;;;;WAIG;QACH,QAAQ;YACJ,OAAO,IAAI,CAAC,KAAK,CAAA;QACrB,CAAC;QAED;;;;WAIG;QACH,QAAQ;YACJ,IAAI,IAAI,CAAC,KAAK,IAAI,GAAG,EAAC;gBAClB,OAAO,OAAO,CAAC;aAClB;YACD,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,uBAAuB;YACnB,OAAO,CAAC,CAAC;QACb,CAAC;QAED,oBAAoB;YAChB,OAAO,IAAI,KAAK,EAAU,CAAC;QAC/B,CAAC;KAEJ;IA3CD,8CA2CC"}
+{"version":3,"file":"DiscreteAttribute.js","sourceRoot":"","sources":["../../source/Attribute/DiscreteAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,2CAAsC;IAEtC,MAAa,iBAAkB,SAAQ,qBAAS;QAI5C;;;;WAIG;QACH,YAAY,KAAa;YACrB,KAAK,EAAE,CAAC;YARK,UAAK,GAAW,MAAM,CAAA;YASnC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QACtB,CAAC;QAED;;;;WAIG;QACH,QAAQ;YACJ,OAAO,IAAI,CAAC,KAAK,CAAA;QACrB,CAAC;QAED;;;;WAIG;QACH,QAAQ;YACJ,IAAI,IAAI,CAAC,KAAK,IAAI,GAAG,EAAC;gBAClB,OAAO,OAAO,CAAC;aAClB;YACD,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,uBAAuB;YACnB,OAAO,CAAC,CAAC;QACb,CAAC;QAED,oBAAoB;YAChB,OAAO,IAAI,KAAK,EAAU,CAAC;QAC/B,CAAC;KAEJ;IA3CD,8CA2CC"}

package/dist/Attribute/DiscreteIndexedAttribute.d.ts

@@ -1,7 +1,7 @@
 import { DiscreteAttribute } from "./DiscreteAttribute";
 export declare class DiscreteIndexedAttribute extends DiscreteAttribute {
-    private index;
-    private maxIndex;
+    private readonly index;
+    private readonly maxIndex;
     /**
      * Constructor for a discrete attribute.
      *

package/dist/DataSet/DataDefinition.d.ts

@@ -10,7 +10,18 @@ export declare class DataDefinition {
      * @param attributeValueList Array of array of strings to represent all possible values of discrete features.
      */
     constructor(attributeTypes?: Array<AttributeType>, attributeValueList?: Array<Array<String>>);
+    /**
+     * Returns number of distinct values for a given discrete attribute with index attributeIndex.
+     * @param attributeIndex Index of the discrete attribute.
+     * @return Number of distinct values for a given discrete attribute
+     */
     numberOfValues(attributeIndex: number): number;
+    /**
+     * Returns the index of the given value in the values list of the attributeIndex'th discrete attribute.
+     * @param attributeIndex Index of the discrete attribute.
+     * @param value Value of the discrete attribute
+     * @return Index of the given value in the values list of the discrete attribute.
+     */
     featureValueIndex(attributeIndex: number, value: String): number;
     /**
      * Returns the number of attribute types.

package/dist/DataSet/DataDefinition.js

@@ -26,9 +26,20 @@
                 }
             }
         }
+        /**
+         * Returns number of distinct values for a given discrete attribute with index attributeIndex.
+         * @param attributeIndex Index of the discrete attribute.
+         * @return Number of distinct values for a given discrete attribute
+         */
         numberOfValues(attributeIndex) {
             return this.attributeValueList[attributeIndex].length;
         }
+        /**
+         * Returns the index of the given value in the values list of the attributeIndex'th discrete attribute.
+         * @param attributeIndex Index of the discrete attribute.
+         * @param value Value of the discrete attribute
+         * @return Index of the given value in the values list of the discrete attribute.
+         */
         featureValueIndex(attributeIndex, value) {
             for (let i = 0; i < this.attributeValueList[attributeIndex].length; i++) {
                 if (this.attributeValueList[attributeIndex][i] == value) {

package/dist/DataSet/DataDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataDefinition.js","sourceRoot":"","sources":["../../source/DataSet/DataDefinition.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,8DAAyD;IAGzD,MAAa,cAAc;QAKvB;;;;;WAKG;QACH,YAAY,cAAqC,EAAE,kBAAyC;YACxF,IAAI,cAAc,IAAI,SAAS,EAAC;gBAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;gBACpC,IAAI,kBAAkB,IAAI,SAAS,EAAC;oBAChC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;iBAChD;aACJ;QACL,CAAC;QAED,cAAc,CAAC,cAAsB;YACjC,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAA;QACzD,CAAC;QAED,iBAAiB,CAAC,cAAsB,EAAE,KAAa;YACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAC;gBACpE,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAC;oBACpD,OAAO,CAAC,CAAA;iBACX;aACJ;YACD,OAAO,CAAC,CAAC,CAAA;QACb,CAAC;QAED;;;;WAIG;QACH,cAAc;YACV,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAA;QACrC,CAAC;QAED;;;;WAIG;QACH,sBAAsB;YAClB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,IAAI,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC3C,IAAI,aAAa,IAAI,6BAAa,CAAC,QAAQ,IAAI,aAAa,IAAI,6BAAa,CAAC,MAAM,EAAE;oBAClF,KAAK,EAAE,CAAC;iBACX;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED;;;;WAIG;QACH,wBAAwB;YACpB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,IAAI,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC3C,IAAI,aAAa,IAAI,6BAAa,CAAC,UAAU,EAAE;oBAC3C,KAAK,EAAE,CAAC;iBACX;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED;;;;;WAKG;QACH,gBAAgB,CAAC,KAAa;YAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC;QAED;;;;WAIG;QACH,YAAY,CAAC,aAA4B;YACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC3C,CAAC;QAED;;;;WAIG;QACH,eAAe,CAAC,KAAa;YACzB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACxC,CAAC;QAED;;WAEG;QACH,mBAAmB;YACf,IAAI,CAAC,cAAc,GAAG,IAAI,KAAK,EAAiB,CAAA;QACpD,CAAC;QAED;;;;;WAKG;QACH,mBAAmB,CAAC,aAA4B;YAC5C,IAAI,iBAAiB,GAAG,IAAI,KAAK,EAAiB,CAAC;YACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC3C,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrE;YACD,OAAO,IAAI,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACjD,CAAC;KACJ;IAxHD,wCAwHC"}
+{"version":3,"file":"DataDefinition.js","sourceRoot":"","sources":["../../source/DataSet/DataDefinition.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,8DAAyD;IAGzD,MAAa,cAAc;QAKvB;;;;;WAKG;QACH,YAAY,cAAqC,EAAE,kBAAyC;YACxF,IAAI,cAAc,IAAI,SAAS,EAAC;gBAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;gBACpC,IAAI,kBAAkB,IAAI,SAAS,EAAC;oBAChC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;iBAChD;aACJ;QACL,CAAC;QAED;;;;WAIG;QACH,cAAc,CAAC,cAAsB;YACjC,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAA;QACzD,CAAC;QAED;;;;;WAKG;QACH,iBAAiB,CAAC,cAAsB,EAAE,KAAa;YACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAC;gBACpE,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAC;oBACpD,OAAO,CAAC,CAAA;iBACX;aACJ;YACD,OAAO,CAAC,CAAC,CAAA;QACb,CAAC;QAED;;;;WAIG;QACH,cAAc;YACV,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAA;QACrC,CAAC;QAED;;;;WAIG;QACH,sBAAsB;YAClB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,IAAI,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC3C,IAAI,aAAa,IAAI,6BAAa,CAAC,QAAQ,IAAI,aAAa,IAAI,6BAAa,CAAC,MAAM,EAAE;oBAClF,KAAK,EAAE,CAAC;iBACX;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED;;;;WAIG;QACH,wBAAwB;YACpB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,IAAI,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC3C,IAAI,aAAa,IAAI,6BAAa,CAAC,UAAU,EAAE;oBAC3C,KAAK,EAAE,CAAC;iBACX;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QAED;;;;;WAKG;QACH,gBAAgB,CAAC,KAAa;YAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC;QAED;;;;WAIG;QACH,YAAY,CAAC,aAA4B;YACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC3C,CAAC;QAED;;;;WAIG;QACH,eAAe,CAAC,KAAa;YACzB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACxC,CAAC;QAED;;WAEG;QACH,mBAAmB;YACf,IAAI,CAAC,cAAc,GAAG,IAAI,KAAK,EAAiB,CAAA;QACpD,CAAC;QAED;;;;;WAKG;QACH,mBAAmB,CAAC,aAA4B;YAC5C,IAAI,iBAAiB,GAAG,IAAI,KAAK,EAAiB,CAAC;YACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC3C,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrE;YACD,OAAO,IAAI,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACjD,CAAC;KACJ;IAnID,wCAmIC"}

package/dist/Experiment/BootstrapRun.js

@@ -33,8 +33,8 @@
             for (let i = 0; i < this.numberOfBootstraps; i++) {
                 let bootstrap = new Bootstrap_1.Bootstrap(experiment.getDataSet().getInstances(), i + experiment.getParameter().getSeed());
                 let bootstrapSample = new InstanceList_1.InstanceList(bootstrap.getSample());
-                experiment.getClassifier().train(bootstrapSample, experiment.getParameter());
-                result.add(experiment.getClassifier().test(experiment.getDataSet().getInstanceList()));
+                experiment.getmodel().train(bootstrapSample, experiment.getParameter());
+                result.add(experiment.getmodel().test(experiment.getDataSet().getInstanceList()));
             }
             return result;
         }

package/dist/Experiment/BootstrapRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"BootstrapRun.js","sourceRoot":"","sources":["../../source/Experiment/BootstrapRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,gFAA2E;IAC3E,kEAA6D;IAC7D,+DAA0D;IAG1D,MAAa,YAAY;QAIrB;;;;WAIG;QACH,YAAY,kBAA0B;YAClC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAChD,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;gBAC9C,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACzH,IAAI,eAAe,GAAG,IAAI,2BAAY,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC9D,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC7E,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;aAC1F;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IA7BD,oCA6BC"}
+{"version":3,"file":"BootstrapRun.js","sourceRoot":"","sources":["../../source/Experiment/BootstrapRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,gFAA2E;IAC3E,kEAA6D;IAC7D,+DAA0D;IAG1D,MAAa,YAAY;QAIrB;;;;WAIG;QACH,YAAY,kBAA0B;YAClC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAChD,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE;gBAC9C,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACzH,IAAI,eAAe,GAAG,IAAI,2BAAY,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC9D,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;gBACxE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;aACrF;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IA7BD,oCA6BC"}

package/dist/Experiment/Experiment.d.ts

@@ -1,23 +1,23 @@
-import { Classifier } from "../Classifier/Classifier";
 import { Parameter } from "../Parameter/Parameter";
 import { DataSet } from "../DataSet/DataSet";
 import { FeatureSubSet } from "../FeatureSelection/FeatureSubSet";
+import { Model } from "../Model/Model";
 export declare class Experiment {
-    private classifier;
-    private parameter;
-    private dataSet;
+    private readonly model;
+    private readonly parameter;
+    private readonly dataSet;
     /**
      * Constructor for a specific machine learning experiment
-     * @param classifier Classifier used in the machine learning experiment
+     * @param model Model used in the machine learning experiment
      * @param parameter Parameter(s) of the classifier.
      * @param dataSet DataSet on which the classifier is run.
      */
-    constructor(classifier: Classifier, parameter: Parameter, dataSet: DataSet);
+    constructor(model: Model, parameter: Parameter, dataSet: DataSet);
     /**
      * Accessor for the classifier attribute.
      * @return Classifier attribute.
      */
-    getClassifier(): Classifier;
+    getmodel(): Model;
     /**
      * Accessor for the parameter attribute.
      * @return Parameter attribute.

package/dist/Experiment/Experiment.js

@@ -13,12 +13,12 @@
     class Experiment {
         /**
          * Constructor for a specific machine learning experiment
-         * @param classifier Classifier used in the machine learning experiment
+         * @param model Model used in the machine learning experiment
          * @param parameter Parameter(s) of the classifier.
          * @param dataSet DataSet on which the classifier is run.
          */
-        constructor(classifier, parameter, dataSet) {
-            this.classifier = classifier;
+        constructor(model, parameter, dataSet) {
+            this.model = model;
             this.parameter = parameter;
             this.dataSet = dataSet;
         }
@@ -26,8 +26,8 @@
          * Accessor for the classifier attribute.
          * @return Classifier attribute.
          */
-        getClassifier() {
-            return this.classifier;
+        getmodel() {
+            return this.model;
         }
         /**
          * Accessor for the parameter attribute.
@@ -49,7 +49,7 @@
          * @return Experiment constructed
          */
         featureSelectedExperiment(featureSubSet) {
-            return new Experiment(this.classifier, this.parameter, this.dataSet.getSubSetOfFeatures(featureSubSet));
+            return new Experiment(this.model, this.parameter, this.dataSet.getSubSetOfFeatures(featureSubSet));
         }
     }
     exports.Experiment = Experiment;

package/dist/Experiment/Experiment.js.map

@@ -1 +1 @@
-{"version":3,"file":"Experiment.js","sourceRoot":"","sources":["../../source/Experiment/Experiment.ts"],"names":[],"mappings":";;;;;;;;;;;;IAKA,MAAa,UAAU;QAMnB;;;;;WAKG;QACH,YAAY,UAAsB,EAAE,SAAoB,EAAE,OAAgB;YACtE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;YAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAC1B,CAAC;QAED;;;WAGG;QACH,aAAa;YACT,OAAO,IAAI,CAAC,UAAU,CAAA;QAC1B,CAAC;QAED;;;WAGG;QACH,YAAY;YACR,OAAO,IAAI,CAAC,SAAS,CAAA;QACzB,CAAC;QAED;;;WAGG;QACH,UAAU;YACN,OAAO,IAAI,CAAC,OAAO,CAAA;QACvB,CAAC;QAED;;;;WAIG;QACH,yBAAyB,CAAC,aAA4B;YAClD,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5G,CAAC;KAEJ;IAnDD,gCAmDC"}
+{"version":3,"file":"Experiment.js","sourceRoot":"","sources":["../../source/Experiment/Experiment.ts"],"names":[],"mappings":";;;;;;;;;;;;IAKA,MAAa,UAAU;QAMnB;;;;;WAKG;QACH,YAAY,KAAY,EAAE,SAAoB,EAAE,OAAgB;YAC5D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAClB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;YAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAC1B,CAAC;QAED;;;WAGG;QACH,QAAQ;YACJ,OAAO,IAAI,CAAC,KAAK,CAAA;QACrB,CAAC;QAED;;;WAGG;QACH,YAAY;YACR,OAAO,IAAI,CAAC,SAAS,CAAA;QACzB,CAAC;QAED;;;WAGG;QACH,UAAU;YACN,OAAO,IAAI,CAAC,OAAO,CAAA;QACvB,CAAC;QAED;;;;WAIG;QACH,yBAAyB,CAAC,aAA4B;YAClD,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,CAAC;QACvG,CAAC;KAEJ;IAnDD,gCAmDC"}

package/dist/Experiment/KFoldRun.d.ts

@@ -1,14 +1,29 @@
 import { MultipleRun } from "./MultipleRun";
 import { Experiment } from "./Experiment";
 import { ExperimentPerformance } from "../Performance/ExperimentPerformance";
-import { Classifier } from "../Classifier/Classifier";
 import { Parameter } from "../Parameter/Parameter";
 import { CrossValidation } from "nlptoolkit-sampling/dist/CrossValidation";
 import { Instance } from "../Instance/Instance";
+import { Model } from "../Model/Model";
 export declare class KFoldRun implements MultipleRun {
     protected K: number;
+    /**
+     * Constructor for KFoldRun class. Basically sets K parameter of the K-fold cross-validation.
+     *
+     * @param K K of the K-fold cross-validation.
+     */
     constructor(K: number);
-    protected runExperiment(classifier: Classifier, parameter: Parameter, experimentPerformance: ExperimentPerformance, crossValidation: CrossValidation<Instance>): void;
+    /**
+     * Runs a K fold cross-validated experiment for the given classifier with the given parameters. The experiment
+     * results will be added to the experimentPerformance.
+     * @param model Model for the experiment
+     * @param parameter Hyperparameters of the classifier of the experiment
+     * @param experimentPerformance Storage to add experiment results
+     * @param crossValidation K-fold crossvalidated dataset.
+     * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+     * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+     */
+    protected runExperiment(model: Model, parameter: Parameter, experimentPerformance: ExperimentPerformance, crossValidation: CrossValidation<Instance>): void;
     /**
      * Execute K-fold cross-validation with the given classifier on the given data set using the given parameters.
      *

package/dist/Experiment/KFoldRun.js

@@ -14,15 +14,30 @@
     const InstanceList_1 = require("../InstanceList/InstanceList");
     const KFoldCrossValidation_1 = require("nlptoolkit-sampling/dist/KFoldCrossValidation");
     class KFoldRun {
+        /**
+         * Constructor for KFoldRun class. Basically sets K parameter of the K-fold cross-validation.
+         *
+         * @param K K of the K-fold cross-validation.
+         */
         constructor(K) {
             this.K = K;
         }
-        runExperiment(classifier, parameter, experimentPerformance, crossValidation) {
+        /**
+         * Runs a K fold cross-validated experiment for the given classifier with the given parameters. The experiment
+         * results will be added to the experimentPerformance.
+         * @param model Model for the experiment
+         * @param parameter Hyperparameters of the classifier of the experiment
+         * @param experimentPerformance Storage to add experiment results
+         * @param crossValidation K-fold crossvalidated dataset.
+         * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+         * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+         */
+        runExperiment(model, parameter, experimentPerformance, crossValidation) {
             for (let i = 0; i < this.K; i++) {
                 let trainSet = new InstanceList_1.InstanceList(crossValidation.getTrainFold(i));
                 let testSet = new InstanceList_1.InstanceList(crossValidation.getTestFold(i));
-                classifier.train(trainSet, parameter);
-                experimentPerformance.add(classifier.test(testSet));
+                model.train(trainSet, parameter);
+                experimentPerformance.add(model.test(testSet));
             }
         }
         /**
@@ -34,7 +49,7 @@
         execute(experiment) {
             let result = new ExperimentPerformance_1.ExperimentPerformance();
             let crossValidation = new KFoldCrossValidation_1.KFoldCrossValidation(experiment.getDataSet().getInstances(), this.K, experiment.getParameter().getSeed());
-            this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation);
+            this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation);
             return result;
         }
     }

package/dist/Experiment/KFoldRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"KFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/KFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,gFAA2E;IAK3E,+DAA0D;IAC1D,wFAAmF;IAEnF,MAAa,QAAQ;QAIjB,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAES,aAAa,CAAC,UAAsB,EACtB,SAAoB,EACpB,qBAA4C,EAC5C,eAA0C;YAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACtC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aACvD;QACL,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9I,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;YACnG,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAjCD,4BAiCC"}
+{"version":3,"file":"KFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/KFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,gFAA2E;IAI3E,+DAA0D;IAC1D,wFAAmF;IAGnF,MAAa,QAAQ;QAIjB;;;;WAIG;QACH,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;;;;;WASG;QACO,aAAa,CAAC,KAAY,EACZ,SAAoB,EACpB,qBAA4C,EAC5C,eAA0C;YAC9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACjC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAClD;QACL,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9I,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;YAC9F,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAhDD,4BAgDC"}

package/dist/Experiment/KFoldRunSeparateTest.d.ts

@@ -1,11 +1,11 @@
 import { KFoldRun } from "./KFoldRun";
-import { Classifier } from "../Classifier/Classifier";
 import { Parameter } from "../Parameter/Parameter";
 import { ExperimentPerformance } from "../Performance/ExperimentPerformance";
 import { InstanceList } from "../InstanceList/InstanceList";
 import { CrossValidation } from "nlptoolkit-sampling/dist/CrossValidation";
 import { Instance } from "../Instance/Instance";
 import { Experiment } from "./Experiment";
+import { Model } from "../Model/Model";
 export declare class KFoldRunSeparateTest extends KFoldRun {
     /**
      * Constructor for KFoldRunSeparateTest class. Basically sets K parameter of the K-fold cross-validation.
@@ -13,7 +13,18 @@ export declare class KFoldRunSeparateTest extends KFoldRun {
      * @param K K of the K-fold cross-validation.
      */
     constructor(K: number);
-    protected runExperiment(classifier: Classifier, parameter: Parameter, experimentPerformance: ExperimentPerformance, crossValidation: CrossValidation<Instance>, testSet?: InstanceList): void;
+    /**
+     * Runs a K fold cross-validated experiment for the given classifier with the given parameters. Testing will be
+     * done on the separate test set. The experiment results will be added to the experimentPerformance.
+     * @param model Model for the experiment
+     * @param parameter Hyperparameters of the classifier of the experiment
+     * @param experimentPerformance Storage to add experiment results
+     * @param crossValidation K-fold crossvalidated dataset.
+     * @param testSet Test set on which experiment performance is calculated.
+     * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+     * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+     */
+    protected runExperiment(model: Model, parameter: Parameter, experimentPerformance: ExperimentPerformance, crossValidation: CrossValidation<Instance>, testSet?: InstanceList): void;
     /**
      * Execute K-fold cross-validation with separate test set with the given classifier on the given data set using the given parameters.
      *

package/dist/Experiment/KFoldRunSeparateTest.js

@@ -24,11 +24,22 @@
         constructor(K) {
             super(K);
         }
-        runExperiment(classifier, parameter, experimentPerformance, crossValidation, testSet) {
+        /**
+         * Runs a K fold cross-validated experiment for the given classifier with the given parameters. Testing will be
+         * done on the separate test set. The experiment results will be added to the experimentPerformance.
+         * @param model Model for the experiment
+         * @param parameter Hyperparameters of the classifier of the experiment
+         * @param experimentPerformance Storage to add experiment results
+         * @param crossValidation K-fold crossvalidated dataset.
+         * @param testSet Test set on which experiment performance is calculated.
+         * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+         * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+         */
+        runExperiment(model, parameter, experimentPerformance, crossValidation, testSet) {
             for (let i = 0; i < this.K; i++) {
                 let trainSet = new InstanceList_1.InstanceList(crossValidation.getTrainFold(i));
-                classifier.train(trainSet, parameter);
-                experimentPerformance.add(classifier.test(testSet));
+                model.train(trainSet, parameter);
+                experimentPerformance.add(model.test(testSet));
             }
         }
         /**
@@ -42,7 +53,7 @@
             let instanceList = experiment.getDataSet().getInstanceList();
             let partition = new Partition_1.Partition(instanceList, 0.25, true);
             let crossValidation = new KFoldCrossValidation_1.KFoldCrossValidation(partition.get(1).getInstances(), this.K, experiment.getParameter().getSeed());
-            this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation, partition.get(0));
+            this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation, partition.get(0));
             return result;
         }
     }

package/dist/Experiment/KFoldRunSeparateTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"KFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/KFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAGpC,gFAA2E;IAC3E,+DAA0D;IAI1D,wFAAmF;IACnF,yDAAoD;IAEpD,MAAa,oBAAqB,SAAQ,mBAAQ;QAE9C;;;;WAIG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAES,aAAa,CAAC,UAAsB,EACtB,SAAoB,EACpB,qBAA4C,EAC5C,eAA0C,EAC1C,OAAsB;YAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACtC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aACvD;QACL,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACvI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrH,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAtCD,oDAsCC"}
+{"version":3,"file":"KFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/KFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAEpC,gFAA2E;IAC3E,+DAA0D;IAI1D,wFAAmF;IACnF,yDAAoD;IAGpD,MAAa,oBAAqB,SAAQ,mBAAQ;QAE9C;;;;WAIG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAED;;;;;;;;;;WAUG;QACO,aAAa,CAAC,KAAY,EACZ,SAAoB,EACpB,qBAA4C,EAC5C,eAA0C,EAC1C,OAAsB;YAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACjC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAClD;QACL,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACvI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChH,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAjDD,oDAiDC"}

package/dist/Experiment/MxKFoldRun.js

@@ -34,7 +34,7 @@
             let result = new ExperimentPerformance_1.ExperimentPerformance();
             for (let j = 0; j < this.M; j++) {
                 let crossValidation = new KFoldCrossValidation_1.KFoldCrossValidation(experiment.getDataSet().getInstances(), this.K, experiment.getParameter().getSeed());
-                this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation);
+                this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation);
             }
             return result;
         }

package/dist/Experiment/MxKFoldRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"MxKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/MxKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAEpC,gFAA2E;IAC3E,wFAAmF;IAGnF,MAAa,UAAW,SAAQ,mBAAQ;QAIpC;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9I,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;aACtG;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IA9BD,gCA8BC"}
+{"version":3,"file":"MxKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/MxKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAEpC,gFAA2E;IAC3E,wFAAmF;IAGnF,MAAa,UAAW,SAAQ,mBAAQ;QAIpC;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC9I,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;aACjG;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IA9BD,gCA8BC"}

package/dist/Experiment/MxKFoldRunSeparateTest.js

@@ -38,7 +38,7 @@
             let partition = new Partition_1.Partition(instanceList, 0.25, true);
             for (let j = 0; j < this.M; j++) {
                 let crossValidation = new KFoldCrossValidation_1.KFoldCrossValidation(partition.get(1).getInstances(), this.K, experiment.getParameter().getSeed());
-                this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation, partition.get(0));
+                this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation, partition.get(0));
             }
             return result;
         }

package/dist/Experiment/MxKFoldRunSeparateTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"MxKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/MxKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,iEAA4D;IAC5D,gFAA2E;IAE3E,yDAAoD;IACpD,wFAAmF;IAGnF,MAAa,sBAAuB,SAAQ,2CAAoB;QAI5D;;;;;;WAMG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACxH;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAhCD,wDAgCC"}
+{"version":3,"file":"MxKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/MxKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,iEAA4D;IAC5D,gFAA2E;IAE3E,yDAAoD;IACpD,wFAAmF;IAGnF,MAAa,sBAAuB,SAAQ,2CAAoB;QAI5D;;;;;;WAMG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACnH;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAhCD,wDAgCC"}

package/dist/Experiment/SingleRunWithK.d.ts

@@ -2,13 +2,28 @@ import { SingleRun } from "./SingleRun";
 import { Experiment } from "./Experiment";
 import { Instance } from "../Instance/Instance";
 import { Performance } from "../Performance/Performance";
-import { Classifier } from "../Classifier/Classifier";
 import { Parameter } from "../Parameter/Parameter";
 import { CrossValidation } from "nlptoolkit-sampling/dist/CrossValidation";
+import { Model } from "../Model/Model";
 export declare class SingleRunWithK implements SingleRun {
-    private K;
+    private readonly K;
+    /**
+     * Constructor for SingleRunWithK class. Basically sets K parameter of the K-fold cross-validation.
+     *
+     * @param K K of the K-fold cross-validation.
+     */
     constructor(K: number);
-    runExperiment(classifier: Classifier, parameter: Parameter, crossValidation: CrossValidation<Instance>): Performance;
+    /**
+     * Runs first fold of a K fold cross-validated experiment for the given classifier with the given parameters.
+     * The experiment result will be returned.
+     * @param model Classifier for the experiment
+     * @param parameter Hyperparameters of the classifier of the experiment
+     * @param crossValidation K-fold crossvalidated dataset.
+     * @return The experiment result of the first fold of the K-fold cross-validated experiment.
+     * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+     * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+     */
+    runExperiment(model: Model, parameter: Parameter, crossValidation: CrossValidation<Instance>): Performance;
     /**
      * Execute Single K-fold cross-validation with the given classifier on the given data set using the given parameters.
      *

package/dist/Experiment/SingleRunWithK.js

@@ -13,13 +13,28 @@
     const KFoldCrossValidation_1 = require("nlptoolkit-sampling/dist/KFoldCrossValidation");
     const InstanceList_1 = require("../InstanceList/InstanceList");
     class SingleRunWithK {
+        /**
+         * Constructor for SingleRunWithK class. Basically sets K parameter of the K-fold cross-validation.
+         *
+         * @param K K of the K-fold cross-validation.
+         */
         constructor(K) {
             this.K = K;
         }
-        runExperiment(classifier, parameter, crossValidation) {
+        /**
+         * Runs first fold of a K fold cross-validated experiment for the given classifier with the given parameters.
+         * The experiment result will be returned.
+         * @param model Classifier for the experiment
+         * @param parameter Hyperparameters of the classifier of the experiment
+         * @param crossValidation K-fold crossvalidated dataset.
+         * @return The experiment result of the first fold of the K-fold cross-validated experiment.
+         * @throws DiscreteFeaturesNotAllowed If the classifier does not allow discrete features and the dataset contains
+         * discrete features, DiscreteFeaturesNotAllowed will be thrown.
+         */
+        runExperiment(model, parameter, crossValidation) {
             let trainSet = new InstanceList_1.InstanceList(crossValidation.getTrainFold(0));
             let testSet = new InstanceList_1.InstanceList(crossValidation.getTestFold(0));
-            return classifier.singleRun(parameter, trainSet, testSet);
+            return model.singleRun(parameter, trainSet, testSet);
         }
         /**
          * Execute Single K-fold cross-validation with the given classifier on the given data set using the given parameters.
@@ -29,7 +44,7 @@
          */
         execute(experiment) {
             let crossValidation = new KFoldCrossValidation_1.KFoldCrossValidation(experiment.getDataSet().getInstances(), this.K, experiment.getParameter().getSeed());
-            return this.runExperiment(experiment.getClassifier(), experiment.getParameter(), crossValidation);
+            return this.runExperiment(experiment.getmodel(), experiment.getParameter(), crossValidation);
         }
     }
     exports.SingleRunWithK = SingleRunWithK;

package/dist/Experiment/SingleRunWithK.js.map

@@ -1 +1 @@
-{"version":3,"file":"SingleRunWithK.js","sourceRoot":"","sources":["../../source/Experiment/SingleRunWithK.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,wFAAmF;IAGnF,+DAA0D;IAK1D,MAAa,cAAc;QAIvB,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED,aAAa,CAAC,UAAsB,EACtB,SAAoB,EACpB,eAA0C;YACpD,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAO,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EACnG,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;QACtG,CAAC;KAEJ;IA5BD,wCA4BC"}
+{"version":3,"file":"SingleRunWithK.js","sourceRoot":"","sources":["../../source/Experiment/SingleRunWithK.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,wFAAmF;IAGnF,+DAA0D;IAK1D,MAAa,cAAc;QAIvB;;;;WAIG;QACH,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;;;;;WASG;QACH,aAAa,CAAC,KAAY,EACZ,SAAoB,EACpB,eAA0C;YACpD,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,eAAe,GAAG,IAAI,2CAAoB,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,EACnG,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;QACjG,CAAC;KAEJ;IA3CD,wCA2CC"}

package/dist/Experiment/StratifiedKFoldRun.js

@@ -30,7 +30,7 @@
         execute(experiment) {
             let result = new ExperimentPerformance_1.ExperimentPerformance();
             let crossValidation = new StratifiedKFoldCrossValidation_1.StratifiedKFoldCrossValidation(experiment.getDataSet().getClassInstances(), this.K, experiment.getParameter().getSeed());
-            this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation);
+            this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation);
             return result;
         }
     }

package/dist/Experiment/StratifiedKFoldRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"StratifiedKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAEpC,gFAA2E;IAC3E,4GAAuG;IAGvG,MAAa,kBAAmB,SAAQ,mBAAQ;QAE5C;;;WAGG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7J,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;YACnG,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAvBD,gDAuBC"}
+{"version":3,"file":"StratifiedKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,yCAAoC;IAEpC,gFAA2E;IAC3E,4GAAuG;IAGvG,MAAa,kBAAmB,SAAQ,mBAAQ;QAE5C;;;WAGG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7J,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;YAC9F,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAvBD,gDAuBC"}

package/dist/Experiment/StratifiedKFoldRunSeparateTest.js

@@ -34,7 +34,7 @@
             let instanceList = experiment.getDataSet().getInstanceList();
             let partition = new Partition_1.Partition(instanceList, 0.25, true);
             let crossValidation = new StratifiedKFoldCrossValidation_1.StratifiedKFoldCrossValidation(new Partition_1.Partition(partition.get(1)).getLists(), this.K, experiment.getParameter().getSeed());
-            this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation, partition.get(0));
+            this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation, partition.get(0));
             return result;
         }
     }

package/dist/Experiment/StratifiedKFoldRunSeparateTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"StratifiedKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,iEAA4D;IAE5D,gFAA2E;IAC3E,yDAAoD;IACpD,4GAAuG;IAGvG,MAAa,8BAA+B,SAAQ,2CAAoB;QAEpE;;;;WAIG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,IAAI,qBAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5J,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrH,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAzBD,wEAyBC"}
+{"version":3,"file":"StratifiedKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,iEAA4D;IAE5D,gFAA2E;IAC3E,yDAAoD;IACpD,4GAAuG;IAGvG,MAAa,8BAA+B,SAAQ,2CAAoB;QAEpE;;;;WAIG;QACH,YAAY,CAAS;YACjB,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,IAAI,qBAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5J,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChH,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAzBD,wEAyBC"}

package/dist/Experiment/StratifiedMxKFoldRun.js

@@ -33,7 +33,7 @@
             let result = new ExperimentPerformance_1.ExperimentPerformance();
             for (let j = 0; j < this.M; j++) {
                 let crossValidation = new StratifiedKFoldCrossValidation_1.StratifiedKFoldCrossValidation(experiment.getDataSet().getClassInstances(), this.K, experiment.getParameter().getSeed());
-                this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation);
+                this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation);
             }
             return result;
         }

package/dist/Experiment/StratifiedMxKFoldRun.js.map

@@ -1 +1 @@
-{"version":3,"file":"StratifiedMxKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedMxKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,6CAAwC;IAExC,gFAA2E;IAC3E,4GAAuG;IAGvG,MAAa,oBAAqB,SAAQ,uBAAU;QAEhD;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAC1G,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;aACtG;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IA3BD,oDA2BC"}
+{"version":3,"file":"StratifiedMxKFoldRun.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedMxKFoldRun.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,6CAAwC;IAExC,gFAA2E;IAC3E,4GAAuG;IAGvG,MAAa,oBAAqB,SAAQ,uBAAU;QAEhD;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAC1G,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;aACjG;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IA3BD,oDA2BC"}

package/dist/Experiment/StratifiedMxKFoldRunSeparateTest.js

@@ -33,11 +33,11 @@
          */
         execute(experiment) {
             let result = new ExperimentPerformance_1.ExperimentPerformance();
+            let instanceList = experiment.getDataSet().getInstanceList();
+            let partition = new Partition_1.Partition(instanceList, 0.25, true);
             for (let j = 0; j < this.M; j++) {
-                let instanceList = experiment.getDataSet().getInstanceList();
-                let partition = new Partition_1.Partition(instanceList, 0.25, true);
                 let crossValidation = new StratifiedKFoldCrossValidation_1.StratifiedKFoldCrossValidation(new Partition_1.Partition(partition.get(1)).getLists(), this.K, experiment.getParameter().getSeed());
-                this.runExperiment(experiment.getClassifier(), experiment.getParameter(), result, crossValidation, partition.get(0));
+                this.runExperiment(experiment.getmodel(), experiment.getParameter(), result, crossValidation, partition.get(0));
             }
             return result;
         }

package/dist/Experiment/StratifiedMxKFoldRunSeparateTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"StratifiedMxKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedMxKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,qFAAgF;IAEhF,gFAA2E;IAC3E,yDAAoD;IAEpD,4GAAuG;IAEvG,MAAa,gCAAiC,SAAQ,+DAA8B;QAIhF;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;gBAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxD,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,IAAI,qBAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EACzG,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACxH;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAhCD,4EAgCC"}
+{"version":3,"file":"StratifiedMxKFoldRunSeparateTest.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedMxKFoldRunSeparateTest.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,qFAAgF;IAEhF,gFAA2E;IAC3E,yDAAoD;IAEpD,4GAAuG;IAEvG,MAAa,gCAAiC,SAAQ,+DAA8B;QAIhF;;;;;WAKG;QACH,YAAY,CAAS,EAAE,CAAS;YAC5B,KAAK,CAAC,CAAC,CAAC,CAAC;YACT,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,MAAM,GAAG,IAAI,6CAAqB,EAAE,CAAC;YACzC,IAAI,YAAY,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,eAAe,EAAE,CAAC;YAC7D,IAAI,SAAS,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC7B,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,IAAI,qBAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EACzG,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACjD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACnH;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAhCD,4EAgCC"}

package/dist/Experiment/StratifiedSingleRunWithK.js

@@ -31,7 +31,7 @@
             let crossValidation = new StratifiedKFoldCrossValidation_1.StratifiedKFoldCrossValidation(experiment.getDataSet().getClassInstances(), this.K, experiment.getParameter().getSeed());
             let trainSet = new InstanceList_1.InstanceList(crossValidation.getTrainFold(0));
             let testSet = new InstanceList_1.InstanceList(crossValidation.getTestFold(0));
-            return experiment.getClassifier().singleRun(experiment.getParameter(), trainSet, testSet);
+            return experiment.getmodel().singleRun(experiment.getParameter(), trainSet, testSet);
         }
     }
     exports.StratifiedSingleRunWithK = StratifiedSingleRunWithK;

package/dist/Experiment/StratifiedSingleRunWithK.js.map

@@ -1 +1 @@
-{"version":3,"file":"StratifiedSingleRunWithK.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedSingleRunWithK.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,4GAAuG;IAEvG,+DAA0D;IAE1D,MAAa,wBAAwB;QAIjC;;;;WAIG;QACH,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAC1G,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAO,UAAU,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9F,CAAC;KACJ;IA1BD,4DA0BC"}
+{"version":3,"file":"StratifiedSingleRunWithK.js","sourceRoot":"","sources":["../../source/Experiment/StratifiedSingleRunWithK.ts"],"names":[],"mappings":";;;;;;;;;;;;IAEA,4GAAuG;IAEvG,+DAA0D;IAE1D,MAAa,wBAAwB;QAIjC;;;;WAIG;QACH,YAAY,CAAS;YACjB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;QACd,CAAC;QAED;;;;;WAKG;QACH,OAAO,CAAC,UAAsB;YAC1B,IAAI,eAAe,GAAG,IAAI,+DAA8B,CAAW,UAAU,CAAC,UAAU,EAAE,CAAC,iBAAiB,EAAE,EAC1G,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,QAAQ,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,OAAO,GAAG,IAAI,2BAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzF,CAAC;KACJ;IA1BD,4DA0BC"}

package/dist/Filter/LaryFilter.d.ts

@@ -7,7 +7,7 @@ export declare abstract class LaryFilter extends FeatureFilter {
     /**
      * Constructor that sets the dataSet and all the attributes distributions.
      *
-     * @param dataSet DataSet that will bu used.
+     * @param dataSet DataSet that will be used.
      */
     constructor(dataSet: DataSet);
     /**

package/dist/Filter/LaryFilter.js

@@ -15,7 +15,7 @@
         /**
          * Constructor that sets the dataSet and all the attributes distributions.
          *
-         * @param dataSet DataSet that will bu used.
+         * @param dataSet DataSet that will be used.
          */
         constructor(dataSet) {
             super(dataSet);

package/dist/Filter/TrainedFeatureFilter.d.ts

@@ -5,7 +5,7 @@ export declare abstract class TrainedFeatureFilter extends FeatureFilter {
     /**
      * Constructor that sets the dataSet.
      *
-     * @param dataSet DataSet that will bu used.
+     * @param dataSet DataSet that will be used.
      */
     constructor(dataSet: DataSet);
 }

package/dist/Filter/TrainedFeatureFilter.js

@@ -15,7 +15,7 @@
         /**
          * Constructor that sets the dataSet.
          *
-         * @param dataSet DataSet that will bu used.
+         * @param dataSet DataSet that will be used.
          */
         constructor(dataSet) {
             super(dataSet);