Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Refactor confusion matrix api .1 #912

Merged
hcyang merged 2 commits into from
Jul 27, 2020
Merged

Refactor confusion matrix api .1 #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a089f
confusion matrix api refactor .1
hcyang Jul 27, 2020
193269a
create path before write to a file
hcyang Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 139 additions & 45 deletions packages/dispatcher/src/data_structure/DictionaryMapUtility.ts
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions packages/dispatcher/src/data_structure/TMapAnyKeyGenericArray.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/

import { TMapGenericKeyGenericArray } from "./TMapGenericKeyGenericArray";
export type TMapAnyKeyGenericArray<T> = TMapGenericKeyGenericArray<any, T>;
7 changes: 7 additions & 0 deletions packages/dispatcher/src/data_structure/TMapAnyKeyGenericArrays.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/

import { TMapGenericKeyGenericArrays } from "./TMapGenericKeyGenericArrays";
export type TMapAnyKeyGenericArrays<T> = TMapGenericKeyGenericArrays<any, T>;
7 changes: 7 additions & 0 deletions packages/dispatcher/src/data_structure/TMapAnyKeyGenericSet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/

import { TMapGenericKeyGenericSet } from "./TMapGenericKeyGenericSet";
export type TMapAnyKeyGenericSet<T> = TMapGenericKeyGenericSet<any, T>;
7 changes: 7 additions & 0 deletions packages/dispatcher/src/data_structure/TMapAnyKeyGenericValue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License.
*/

import { TMapGenericKeyGenericValue } from "./TMapGenericKeyGenericValue";
export type TMapAnyKeyGenericValue<T> = TMapGenericKeyGenericValue<any, T>;
234 changes: 80 additions & 154 deletions packages/dispatcher/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,169 +3,95 @@
* Licensed under the MIT License.
*/

import { ColumnarData } from "./data/ColumnarData";
import { Data } from "./data/Data";
import { DataUtility } from "./data/DataUtility";
import { EntityAnnotatedCorpusData } from "./data/EntityAnnotatedCorpusData";
import { LuData } from "./data/LuData";
export { ColumnarData } from "./data/ColumnarData";
export { Data } from "./data/Data";
export { DataUtility } from "./data/DataUtility";
export { EntityAnnotatedCorpusData } from "./data/EntityAnnotatedCorpusData";
export { LuData } from "./data/LuData";

import { DictionaryMapUtility } from "./data_structure/DictionaryMapUtility";
import { IDictionaryNumberIdGenericArray } from "./data_structure/IDictionaryNumberIdGenericArray";
import { IDictionaryNumberIdGenericArrays } from "./data_structure/IDictionaryNumberIdGenericArrays";
import { IDictionaryNumberIdGenericSet } from "./data_structure/IDictionaryNumberIdGenericSet";
import { IDictionaryNumberIdGenericValue } from "./data_structure/IDictionaryNumberIdGenericValue";
import { IDictionaryStringIdGenericArray } from "./data_structure/IDictionaryStringIdGenericArray";
import { IDictionaryStringIdGenericArrays } from "./data_structure/IDictionaryStringIdGenericArrays";
import { IDictionaryStringIdGenericSet } from "./data_structure/IDictionaryStringIdGenericSet";
import { IDictionaryStringIdGenericValue } from "./data_structure/IDictionaryStringIdGenericValue";
import { TMapGenericKeyGenericArray } from "./data_structure/TMapGenericKeyGenericArray";
import { TMapGenericKeyGenericArrays } from "./data_structure/TMapGenericKeyGenericArrays";
import { TMapGenericKeyGenericSet } from "./data_structure/TMapGenericKeyGenericSet";
import { TMapGenericKeyGenericValue } from "./data_structure/TMapGenericKeyGenericValue";
import { TMapNumberKeyGenericArray } from "./data_structure/TMapNumberKeyGenericArray";
import { TMapNumberKeyGenericArrays } from "./data_structure/TMapNumberKeyGenericArrays";
import { TMapNumberKeyGenericSet } from "./data_structure/TMapNumberKeyGenericSet";
import { TMapNumberKeyGenericValue } from "./data_structure/TMapNumberKeyGenericValue";
import { TMapStringKeyGenericArray } from "./data_structure/TMapStringKeyGenericArray";
import { TMapStringKeyGenericArrays } from "./data_structure/TMapStringKeyGenericArrays";
import { TMapStringKeyGenericSet } from "./data_structure/TMapStringKeyGenericSet";
import { TMapStringKeyGenericValue } from "./data_structure/TMapStringKeyGenericValue";
export { DictionaryMapUtility } from "./data_structure/DictionaryMapUtility";
export { IDictionaryNumberIdGenericArray } from "./data_structure/IDictionaryNumberIdGenericArray";
export { IDictionaryNumberIdGenericArrays } from "./data_structure/IDictionaryNumberIdGenericArrays";
export { IDictionaryNumberIdGenericSet } from "./data_structure/IDictionaryNumberIdGenericSet";
export { IDictionaryNumberIdGenericValue } from "./data_structure/IDictionaryNumberIdGenericValue";
export { IDictionaryStringIdGenericArray } from "./data_structure/IDictionaryStringIdGenericArray";
export { IDictionaryStringIdGenericArrays } from "./data_structure/IDictionaryStringIdGenericArrays";
export { IDictionaryStringIdGenericSet } from "./data_structure/IDictionaryStringIdGenericSet";
export { IDictionaryStringIdGenericValue } from "./data_structure/IDictionaryStringIdGenericValue";
export { TMapAnyKeyGenericArray } from "./data_structure/TMapAnyKeyGenericArray";
export { TMapAnyKeyGenericArrays } from "./data_structure/TMapAnyKeyGenericArrays";
export { TMapAnyKeyGenericSet } from "./data_structure/TMapAnyKeyGenericSet";
export { TMapAnyKeyGenericValue } from "./data_structure/TMapAnyKeyGenericValue";
export { TMapGenericKeyGenericArray } from "./data_structure/TMapGenericKeyGenericArray";
export { TMapGenericKeyGenericArrays } from "./data_structure/TMapGenericKeyGenericArrays";
export { TMapGenericKeyGenericSet } from "./data_structure/TMapGenericKeyGenericSet";
export { TMapGenericKeyGenericValue } from "./data_structure/TMapGenericKeyGenericValue";
export { TMapNumberKeyGenericArray } from "./data_structure/TMapNumberKeyGenericArray";
export { TMapNumberKeyGenericArrays } from "./data_structure/TMapNumberKeyGenericArrays";
export { TMapNumberKeyGenericSet } from "./data_structure/TMapNumberKeyGenericSet";
export { TMapNumberKeyGenericValue } from "./data_structure/TMapNumberKeyGenericValue";
export { TMapStringKeyGenericArray } from "./data_structure/TMapStringKeyGenericArray";
export { TMapStringKeyGenericArrays } from "./data_structure/TMapStringKeyGenericArrays";
export { TMapStringKeyGenericSet } from "./data_structure/TMapStringKeyGenericSet";
export { TMapStringKeyGenericValue } from "./data_structure/TMapStringKeyGenericValue";

import { mainConfusionMatrix } from "./mathematics/confusion_matrix/AppConfusionMatrix";
import { mainConfusionMatrixFunction } from "./mathematics/confusion_matrix/AppConfusionMatrix";
import { BinaryConfusionMatrix } from "./mathematics/confusion_matrix/BinaryConfusionMatrix";
import { ConfusionMatrix } from "./mathematics/confusion_matrix/ConfusionMatrix";
import { ConfusionMatrixBase } from "./mathematics/confusion_matrix/ConfusionMatrixBase";
import { IConfusionMatrix } from "./mathematics/confusion_matrix/IConfusionMatrix";
import { IMultiLabelConfusionMatrix } from "./mathematics/confusion_matrix/IMultiLabelConfusionMatrix";
import { MultiLabelConfusionMatrix } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrix";
import { MultiLabelConfusionMatrixBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixBase";
import { MultiLabelConfusionMatrixSubset } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixSubset";
import { MultiLabelConfusionMatrixWithBinaryArrayBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixWithBinaryArrayBase";
import { MultiLabelConfusionMatrixWithBinaryBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixWithBinaryBase";
export { mainConfusionMatrix } from "./mathematics/confusion_matrix/AppConfusionMatrix";
export { mainConfusionMatrixFunction } from "./mathematics/confusion_matrix/AppConfusionMatrix";
export { BinaryConfusionMatrix } from "./mathematics/confusion_matrix/BinaryConfusionMatrix";
export { ConfusionMatrix } from "./mathematics/confusion_matrix/ConfusionMatrix";
export { ConfusionMatrixBase } from "./mathematics/confusion_matrix/ConfusionMatrixBase";
export { IConfusionMatrix } from "./mathematics/confusion_matrix/IConfusionMatrix";
export { IMultiLabelConfusionMatrix } from "./mathematics/confusion_matrix/IMultiLabelConfusionMatrix";
export { ISingleLabelConfusionMatrix } from "./mathematics/confusion_matrix/ISingleLabelConfusionMatrix";
export { MultiLabelConfusionMatrix } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrix";
export { MultiLabelConfusionMatrixBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixBase";
export { MultiLabelConfusionMatrixSubset } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixSubset";
export { MultiLabelConfusionMatrixWithBinaryArrayBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixWithBinaryArrayBase";
export { MultiLabelConfusionMatrixWithBinaryBase } from "./mathematics/confusion_matrix/MultiLabelConfusionMatrixWithBinaryBase";

import { IMathematicsHelper } from "./mathematics/mathematics_helper/IMathematicsHelper";
import { MathematicsHelper } from "./mathematics/mathematics_helper/MathematicsHelper";
export { IMathematicsHelper } from "./mathematics/mathematics_helper/IMathematicsHelper";
export { MathematicsHelper } from "./mathematics/mathematics_helper/MathematicsHelper";

import { AbstractBaseBootstrapSampler } from "./mathematics/sampler/AbstractBaseBootstrapSampler";
import { AbstractBaseReservoirSampler } from "./mathematics/sampler/AbstractBaseReservoirSampler";
import { AbstractBaseSampler } from "./mathematics/sampler/AbstractBaseSampler";
import { BootstrapSampler } from "./mathematics/sampler/BootstrapSampler";
import { BootstrapSamplerDistribution } from "./mathematics/sampler/BootstrapSamplerDistribution";
import { BootstrapSamplerKeyMap } from "./mathematics/sampler/BootstrapSamplerKeyMap";
import { BootstrapSamplerKeyMapDistribution } from "./mathematics/sampler/BootstrapSamplerKeyMapDistribution";
import { ReservoirArraySampler } from "./mathematics/sampler/ReservoirArraySampler";
import { ReservoirSampler } from "./mathematics/sampler/ReservoirSampler";
import { ReservoirSamplerKeyMap } from "./mathematics/sampler/ReservoirSamplerKeyMap";
export { AbstractBaseBootstrapSampler } from "./mathematics/sampler/AbstractBaseBootstrapSampler";
export { AbstractBaseReservoirSampler } from "./mathematics/sampler/AbstractBaseReservoirSampler";
export { AbstractBaseSampler } from "./mathematics/sampler/AbstractBaseSampler";
export { BootstrapSampler } from "./mathematics/sampler/BootstrapSampler";
export { BootstrapSamplerDistribution } from "./mathematics/sampler/BootstrapSamplerDistribution";
export { BootstrapSamplerKeyMap } from "./mathematics/sampler/BootstrapSamplerKeyMap";
export { BootstrapSamplerKeyMapDistribution } from "./mathematics/sampler/BootstrapSamplerKeyMapDistribution";
export { ReservoirArraySampler } from "./mathematics/sampler/ReservoirArraySampler";
export { ReservoirSampler } from "./mathematics/sampler/ReservoirSampler";
export { ReservoirSamplerKeyMap } from "./mathematics/sampler/ReservoirSamplerKeyMap";

import { mainCrossValidatorWithColumnarContent } from "./model/evaluation/cross_validation/AppCrossValidator";
import { mainCrossValidatorWithLuContent } from "./model/evaluation/cross_validation/AppCrossValidator";
import { mainCrossValidator } from "./model/evaluation/cross_validation/AppCrossValidator";
import { CrossValidator } from "./model/evaluation/cross_validation/CrossValidator";
export { mainCrossValidatorWithColumnarContent } from "./model/evaluation/cross_validation/AppCrossValidator";
export { mainCrossValidatorWithLuContent } from "./model/evaluation/cross_validation/AppCrossValidator";
export { mainCrossValidator } from "./model/evaluation/cross_validation/AppCrossValidator";
export { CrossValidator } from "./model/evaluation/cross_validation/CrossValidator";

import { mainPredictor } from "./model/evaluation/predict/AppPredictor";
import { Predictor } from "./model/evaluation/predict/Predictor";
export { mainPredictor } from "./model/evaluation/predict/AppPredictor";
export { Predictor } from "./model/evaluation/predict/Predictor";

import { mainDataProfileReporter } from "./model/evaluation/report/AppDataProfileReporter";
import { DataProfileReporter } from "./model/evaluation/report/DataProfileReporter";
import { mainModelMetaDataProfileReporter } from "./model/evaluation/report/AppModelMetaDataProfileReporter";
import { ModelMetaDataProfileReporter } from "./model/evaluation/report/ModelMetaDataProfileReporter";
import { mainThresholdReporter } from "./model/evaluation/report/AppThresholdReporter";
import { ThresholdReporter } from "./model/evaluation/report/ThresholdReporter";
export { mainDataProfileReporter } from "./model/evaluation/report/AppDataProfileReporter";
export { DataProfileReporter } from "./model/evaluation/report/DataProfileReporter";
export { mainModelMetaDataProfileReporter } from "./model/evaluation/report/AppModelMetaDataProfileReporter";
export { ModelMetaDataProfileReporter } from "./model/evaluation/report/ModelMetaDataProfileReporter";
export { mainThresholdReporter } from "./model/evaluation/report/AppThresholdReporter";
export { ThresholdReporter } from "./model/evaluation/report/ThresholdReporter";

import { mainTester } from "./model/evaluation/test/AppTester";
import { Tester } from "./model/evaluation/test/Tester";
export { mainTester } from "./model/evaluation/test/AppTester";
export { Tester } from "./model/evaluation/test/Tester";

import { AppAutoActiveLearner } from "./model/supervised/classifier/auto_active_learning/AppAutoActiveLearner";
import { AutoActiveLearner } from "./model/supervised/classifier/auto_active_learning/AutoActiveLearner";
export { ISparseTextFeaturizer } from "./model/language_understanding/featurizer/ISparseTextFeaturizer";
export { ITextFeaturizer } from "./model/language_understanding/featurizer/ITextFeaturizer";
export { NgramSubwordFeaturizer } from "./model/language_understanding/featurizer/NgramSubwordFeaturizer";

import { AppSoftmaxRegressionSparse } from "./model/supervised/classifier/neural_network/learner/AppSoftmaxRegressionSparse";
import { SoftmaxRegressionSparse } from "./model/supervised/classifier/neural_network/learner/SoftmaxRegressionSparse";
export { AppAutoActiveLearner } from "./model/supervised/classifier/auto_active_learning/AppAutoActiveLearner";
export { AutoActiveLearner } from "./model/supervised/classifier/auto_active_learning/AutoActiveLearner";

import { Utility } from "./utility/Utility";
import { ListArrayUtility } from "./utility/ListArrayUtility";
export { AppSoftmaxRegressionSparse } from "./model/supervised/classifier/neural_network/learner/AppSoftmaxRegressionSparse";
export { SoftmaxRegressionSparse } from "./model/supervised/classifier/neural_network/learner/SoftmaxRegressionSparse";

export default {
ColumnarData,
Data,
DataUtility,
EntityAnnotatedCorpusData,
LuData
,
DictionaryMapUtility
// IDictionaryNumberIdGenericArray,
// IDictionaryNumberIdGenericArrays,
// IDictionaryNumberIdGenericSet,
// IDictionaryNumberIdGenericValue,
// IDictionaryStringIdGenericArray,
// IDictionaryStringIdGenericArrays,
// IDictionaryStringIdGenericSet,
// IDictionaryStringIdGenericValue,
// TMapGenericKeyGenericArray,
// TMapGenericKeyGenericArrays,
// TMapGenericKeyGenericSet,
// TMapGenericKeyGenericValue,
// TMapNumberKeyGenericArray,
// TMapNumberKeyGenericArrays,
// TMapNumberKeyGenericSet,
// TMapNumberKeyGenericValue,
// TMapStringKeyGenericArray,
// TMapStringKeyGenericArrays,
// TMapStringKeyGenericSet,
// TMapStringKeyGenericValue
,
mainConfusionMatrix,
mainConfusionMatrixFunction,
BinaryConfusionMatrix,
ConfusionMatrix,
ConfusionMatrixBase,
// IConfusionMatrix,
// IMultiLabelConfusionMatrix,
MultiLabelConfusionMatrix,
MultiLabelConfusionMatrixBase,
MultiLabelConfusionMatrixSubset,
MultiLabelConfusionMatrixWithBinaryArrayBase,
MultiLabelConfusionMatrixWithBinaryBase
,
// IMathematicsHelper,
MathematicsHelper
,
AbstractBaseBootstrapSampler,
AbstractBaseReservoirSampler,
AbstractBaseSampler,
BootstrapSampler,
BootstrapSamplerDistribution,
BootstrapSamplerKeyMap,
BootstrapSamplerKeyMapDistribution,
ReservoirArraySampler,
ReservoirSampler,
ReservoirSamplerKeyMap
,
mainCrossValidatorWithColumnarContent,
mainCrossValidatorWithLuContent,
mainCrossValidator,
CrossValidator
,
mainPredictor,
Predictor
,
mainDataProfileReporter,
DataProfileReporter,
mainModelMetaDataProfileReporter,
ModelMetaDataProfileReporter,
mainThresholdReporter,
ThresholdReporter
,
mainTester,
Tester
,
AppAutoActiveLearner,
AutoActiveLearner
,
AppSoftmaxRegressionSparse,
SoftmaxRegressionSparse
,
Utility,
ListArrayUtility
,
};
export { Utility } from "./utility/Utility";
export { ListArrayUtility } from "./utility/ListArrayUtility";

export default {};
6 changes: 4 additions & 2 deletions packages/dispatcher/src/mathematics/confusion_matrix/ConfusionMatrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
* Licensed under the MIT License.
*/

import { ISingleLabelConfusionMatrix } from "./ISingleLabelConfusionMatrix";
import { ConfusionMatrixBase } from "./ConfusionMatrixBase";

import { BinaryConfusionMatrix } from "./BinaryConfusionMatrix";

import { DictionaryMapUtility } from "../../data_structure/DictionaryMapUtility";

import { Utility } from "../../utility/Utility";

export class ConfusionMatrix extends ConfusionMatrixBase {
export class ConfusionMatrix
extends ConfusionMatrixBase
implements ISingleLabelConfusionMatrix {

protected confusionMatrix: number[][] = [];
protected confusionMatrixRows: number[] = [];
Expand Down
Loading