From 91beabb5565a15f2fc12cb1d14644f9b2c756809 Mon Sep 17 00:00:00 2001 From: Yonatan Bentzur Date: Wed, 10 Apr 2019 23:11:40 -0700 Subject: [PATCH 1/3] added classification definition to classifiers --- types/natural/index.d.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/types/natural/index.d.ts b/types/natural/index.d.ts index a0f9597241..2809399e0e 100644 --- a/types/natural/index.d.ts +++ b/types/natural/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Natural 0.2.2 +// Type definitions for Natural v0.6.3 // Project: https://github.com/NaturalNode/natural // Definitions by: Dylan R. E. Moonfire // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -67,6 +67,7 @@ declare var LancasterStemmer: { stem(token: string): string; } +interface BayesClassifierClassification { label: string, value: number } interface BayesClassifierCallback { (err: any, classifier: any): void } declare class BayesClassifier { events: events.EventEmitter; @@ -74,12 +75,13 @@ declare class BayesClassifier { addDocument(text: string[], stem: string): void; train(): void; classify(observation: string): string; - getClassifications(observation: string): string[]; + getClassifications(observation: string): BayesClassifierClassification[]; save(filename: string, callback: BayesClassifierCallback): void; static load(filename: string, stemmer: Stemmer, callback: BayesClassifierCallback): void; static restore(classifier: any, stemmer?: Stemmer): BayesClassifier; } +interface LogisticRegressionClassifierClassification { label: string, value: number } interface LogisticRegressionClassifierCallback { (err: any, classifier: any): void } declare class LogisticRegressionClassifier { events: events.EventEmitter; @@ -87,7 +89,7 @@ declare class LogisticRegressionClassifier { addDocument(text: string[], stem: string): void; train(): void; classify(observation: string): string; - getClassifications(observation: string): string[]; + getClassifications(observation: string): LogisticRegressionClassifierClassification[]; save(filename: string, callback: LogisticRegressionClassifierCallback): void; static load(filename: string, stemmer: Stemmer, callback: LogisticRegressionClassifierCallback): void; static restore(classifier: any, stemmer?: Stemmer): LogisticRegressionClassifier; From eec7856509f65bdd901676afa76462f9ca1ea6c5 Mon Sep 17 00:00:00 2001 From: Yonatan Bentzur Date: Wed, 10 Apr 2019 23:12:16 -0700 Subject: [PATCH 2/3] updated tests to use classification definition --- types/natural/natural-tests.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/types/natural/natural-tests.ts b/types/natural/natural-tests.ts index f994928f80..8a680f63c1 100644 --- a/types/natural/natural-tests.ts +++ b/types/natural/natural-tests.ts @@ -59,7 +59,12 @@ classifier.addDocument('sell gold', 'sell'); classifier.train(); console.log(classifier.classify('i am short silver')); console.log(classifier.classify('i am long copper')); -console.log(classifier.getClassifications('i am long copper')); +var classifications = classifier.getClassifications('i am long copper'); +classifications.forEach(function(classification) { + var label = classification.label + var value = classification.value + console.log('label: ' + label + ', value: ' + value) +}) classifier.addDocument(['sell', 'gold'], 'sell'); classifier.events.on('trainedWithDocument', function (obj: any) { console.log(obj); From 334cb1c8145f4ce861a02a5f288737eefaa84780 Mon Sep 17 00:00:00 2001 From: Yonatan Bentzur Date: Mon, 15 Apr 2019 09:58:07 -0700 Subject: [PATCH 3/3] fixed header errors --- types/natural/index.d.ts | 2 +- types/natural/natural-tests.ts | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/types/natural/index.d.ts b/types/natural/index.d.ts index 2809399e0e..cf5cc53c15 100644 --- a/types/natural/index.d.ts +++ b/types/natural/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Natural v0.6.3 +// Type definitions for Natural 0.6 // Project: https://github.com/NaturalNode/natural // Definitions by: Dylan R. E. Moonfire // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped diff --git a/types/natural/natural-tests.ts b/types/natural/natural-tests.ts index 8a680f63c1..9abb4624e4 100644 --- a/types/natural/natural-tests.ts +++ b/types/natural/natural-tests.ts @@ -1,9 +1,3 @@ -// Type definitions for Natural 0.2.1 -// Project: https://github.com/NaturalNode/natural -// Definitions by: Dylan R. E. Moonfire -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - - import natural = require('natural'); // Tokenizers