Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 48d9988

Browse files
dcrescimdcrescim
authored
Merge pull request #219 from javascriptdata/rename-file-and-names
Renamed files for class name consistency
2 parents 019b540 + 1a5017a commit 48d9988

File tree

78 files changed

+180
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+180
-173
lines changed

‎package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
"typescript": "^4.5.4"
125125
},
126126
"jest": {
127+
"testPathIgnorePatterns" : [
128+
"<rootDir>/src/index.test.ts"
129+
],
127130
"testEnvironment": "node",
128131
"preset": "ts-jest",
129132
"globals": {

‎src/cluster/kmeans.test.ts renamed to ‎src/cluster/KMeans.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { KMeans } from './kmeans'
1+
import { KMeans } from './KMeans'
22

33
// Next steps: Improve on kmeans cluster testing
44
describe('KMeans', () => {
@@ -40,7 +40,7 @@ describe('KMeans', () => {
4040

4141
it('should save kmeans model', () => {
4242
const expectedResult = {
43-
name: 'kmeans',
43+
name: 'KMeans',
4444
nClusters: 2,
4545
init: 'random',
4646
maxIter: 300,

‎src/cluster/kmeans.ts renamed to ‎src/cluster/KMeans.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class KMeans extends Serialize {
7171
clusterCenters: tf.Tensor2D
7272

7373
/** Useful for pipelines and column transformers to have a default name for transforms */
74-
name = 'kmeans'
74+
name = 'KMeans'
7575

7676
constructor({
7777
nClusters = 8,
@@ -145,7 +145,7 @@ export class KMeans extends Serialize {
145145
}
146146

147147
/**
148-
* Converts 2D input into a 1D Tensor which holds the Kmeans cluster Class label
148+
* Converts 2D input into a 1D Tensor which holds the KMeans cluster Class label
149149
* @param X The 2D Matrix that you wish to cluster
150150
*/
151151
public predict(X: Scikit2D): tf.Tensor1D {

‎src/compose/columnTransformer.test.ts renamed to ‎src/compose/ColumnTransformer.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ColumnTransformer } from './columnTransformer'
2-
import { MinMaxScaler } from '../preprocessing/minMaxScaler'
3-
import { SimpleImputer } from '../impute/simpleImputer'
1+
import { ColumnTransformer } from './ColumnTransformer'
2+
import { MinMaxScaler } from '../preprocessing/MinMaxScaler'
3+
import { SimpleImputer } from '../impute/SimpleImputer'
44
import * as dfd from 'danfojs-node'
55

66
describe('ColumnTransformer', function () {

‎src/compose/columnTransformer.ts renamed to ‎src/compose/ColumnTransformer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class ColumnTransformer {
6969
remainder: Transformer | 'drop' | 'passthrough'
7070

7171
/** Useful for pipelines and column transformers to have a default name for transforms */
72-
name = 'columntransformer'
72+
name = 'ColumnTransformer'
7373

7474
constructor({
7575
transformers = [],

‎src/dummy/dummyClassifier.test.ts renamed to ‎src/dummy/DummyClassifier.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DummyClassifier } from './dummyClassifier'
1+
import { DummyClassifier } from './DummyClassifier'
22

33
describe('DummyClassifier', function () {
44
it('Use DummyClassifier on simple example (mostFrequent)', function () {
@@ -62,7 +62,7 @@ describe('DummyClassifier', function () {
6262
]
6363
const y = [10, 20, 20, 30]
6464
const expectedResult = {
65-
name: 'dummyclassifier',
65+
name: 'DummyClassifier',
6666
EstimatorType: 'classifier',
6767
constant: 20,
6868
strategy: 'mostFrequent',

‎src/dummy/dummyClassifier.ts renamed to ‎src/dummy/DummyClassifier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class DummyClassifier extends ClassifierMixin {
8585
classes: number[] | string[]
8686

8787
/** Useful for pipelines and column transformers to have a default name for transforms */
88-
name = 'dummyclassifier'
88+
name = 'DummyClassifier'
8989

9090
constructor({
9191
strategy = 'mostFrequent',

‎src/dummy/dummyRegressor.test.ts renamed to ‎src/dummy/DummyRegressor.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DummyRegressor } from './dummyRegressor'
1+
import { DummyRegressor } from './DummyRegressor'
22

33
describe('DummyRegressor', function () {
44
it('Use DummyRegressor on simple example (mean)', function () {
@@ -65,7 +65,7 @@ describe('DummyRegressor', function () {
6565
]
6666
const y = [10, 12, 30]
6767
const saveResult = {
68-
name: 'dummyregressor',
68+
name: 'DummyRegressor',
6969
EstimatorType: 'regressor',
7070
strategy: 'constant',
7171
constant: 10

‎src/dummy/dummyRegressor.ts renamed to ‎src/dummy/DummyRegressor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class DummyRegressor extends RegressorMixin {
8484
quantile?: number
8585

8686
/** Useful for pipelines and column transformers to have a default name for transforms */
87-
name = 'dummyregressor'
87+
name = 'DummyRegressor'
8888

8989
constructor({
9090
strategy = 'mean',

‎src/ensemble/votingClassifier.test.ts renamed to ‎src/ensemble/VotingClassifier.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { makeVotingClassifier, VotingClassifier } from './votingClassifier'
2-
import { DummyClassifier } from '../dummy/dummyClassifier'
1+
import { makeVotingClassifier, VotingClassifier } from './VotingClassifier'
2+
import { DummyClassifier } from '../dummy/DummyClassifier'
33

4-
import { LogisticRegression } from '../linear_model/logisticRegression'
4+
import { LogisticRegression } from '../linear_model/LogisticRegression'
55

66
describe('VotingClassifier', function () {
77
it('Use VotingClassifier on simple example (voting = hard)', async function () {

‎src/ensemble/votingClassifier.ts renamed to ‎src/ensemble/VotingClassifier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Scikit1D, Scikit2D } from '../types'
22
import { tf } from '../shared/globals'
33
import { ClassifierMixin } from '../mixins'
4-
import { LabelEncoder } from '../preprocessing/labelEncoder'
4+
import { LabelEncoder } from '../preprocessing/LabelEncoder'
55
import { fromJson, toJson } from './serializeEnsemble'
66

77
/*

‎src/ensemble/votingRegressor.test.ts renamed to ‎src/ensemble/VotingRegressor.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { makeVotingRegressor, VotingRegressor } from './votingRegressor'
2-
import { DummyRegressor } from '../dummy/dummyRegressor'
3-
import { LinearRegression } from '../linear_model/linearRegression'
1+
import { makeVotingRegressor, VotingRegressor } from './VotingRegressor'
2+
import { DummyRegressor } from '../dummy/DummyRegressor'
3+
import { LinearRegression } from '../linear_model/LinearRegression'
44

55
describe('VotingRegressor', function () {
66
it('Use VotingRegressor on simple example ', async function () {

‎src/ensemble/votingRegressor.ts renamed to ‎src/ensemble/VotingRegressor.ts

File renamed without changes.

‎src/ensemble/serializeEnsemble.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
import { DummyClassifier } from '../dummy/dummyClassifier'
2-
import { DummyRegressor } from '../dummy/dummyRegressor'
3-
import { LogisticRegression } from '../linear_model/logisticRegression'
4-
import { RidgeRegression } from '../linear_model/ridgeRegression'
5-
import { LinearRegression } from '../linear_model/linearRegression'
6-
import { LassoRegression } from '../linear_model/lassoRegression'
7-
import { ElasticNet } from '../linear_model/elasticNet'
8-
import { LabelEncoder } from '../preprocessing/labelEncoder'
9-
import { SimpleImputer } from '../impute/simpleImputer'
1+
import { DummyClassifier } from '../dummy/DummyClassifier'
2+
import { DummyRegressor } from '../dummy/DummyRegressor'
3+
import { LogisticRegression } from '../linear_model/LogisticRegression'
4+
import { RidgeRegression } from '../linear_model/RidgeRegression'
5+
import { LinearRegression } from '../linear_model/LinearRegression'
6+
import { LassoRegression } from '../linear_model/LassoRegression'
7+
import { ElasticNet } from '../linear_model/ElasticNet'
8+
import { LabelEncoder } from '../preprocessing/LabelEncoder'
9+
import { SimpleImputer } from '../impute/SimpleImputer'
1010
import { tf } from '../shared/globals'
11-
import { MinMaxScaler } from '../preprocessing/minMaxScaler'
11+
import { MinMaxScaler } from '../preprocessing/MinMaxScaler'
1212

1313
function getEstimator(name: string, serialJson: string) {
1414
switch (name) {
15-
case 'dummyclassifier':
15+
case 'DummyClassifier':
1616
return new DummyClassifier().fromJson(serialJson)
17-
case 'dummyregressor':
17+
case 'DummyRegressor':
1818
return new DummyRegressor().fromJson(serialJson)
19-
case 'logisticregression':
19+
case 'LogisticRegression':
2020
return new LogisticRegression().fromJson(serialJson)
21-
case 'ridgeregression':
21+
case 'RidgeRegression':
2222
return new RidgeRegression().fromJson(serialJson)
23-
case 'linearregression':
23+
case 'LinearRegression':
2424
return new LinearRegression().fromJson(serialJson)
25-
case 'lassoregression':
25+
case 'LassoRegression':
2626
return new LassoRegression().fromJson(serialJson)
27-
case 'elasticnet':
27+
case 'ElasticNet':
2828
return new ElasticNet().fromJson(serialJson)
29-
case 'simpleimputer':
29+
case 'SimpleImputer':
3030
return new SimpleImputer().fromJson(serialJson)
31-
case 'minmaxscaler':
31+
case 'MinMaxScaler':
3232
return new MinMaxScaler().fromJson(serialJson)
3333
default:
3434
throw new Error(`${name} estimator not supported`)

‎src/impute/simpleImputer.test.ts renamed to ‎src/impute/SimpleImputer.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { tf } from '../shared/globals'
2-
import { SimpleImputer } from './simpleImputer'
2+
import { SimpleImputer } from './SimpleImputer'
33

44
describe('SimpleImputer', function () {
55
it('Imputes with "constant" strategy 2D one column. In this strategy, we give the fill value', function () {
@@ -131,7 +131,7 @@ describe('SimpleImputer', function () {
131131
]
132132

133133
const expected = {
134-
name: 'simpleimputer',
134+
name: 'SimpleImputer',
135135
missingValues: null,
136136
strategy: 'mostFrequent',
137137
statistics: {

‎src/impute/simpleImputer.ts renamed to ‎src/impute/SimpleImputer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class SimpleImputer extends TransformerMixin {
6666
statistics: tf.Tensor1D
6767

6868
/** Useful for pipelines and column transformers to have a default name for transforms */
69-
name = 'simpleimputer'
69+
name = 'SimpleImputer'
7070

7171
constructor({
7272
strategy = 'mean',

‎src/index.test.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
import './cluster/kmeans.test'
2-
import './compose/columnTransformer.test'
1+
import './cluster/KMeans.test'
2+
import './compose/ColumnTransformer.test'
33
import './datasets/makeRegression.test'
4-
import './dummy/dummyClassifier.test'
5-
import './dummy/dummyRegressor.test'
6-
import './ensemble/votingClassifier.test'
7-
import './ensemble/votingRegressor.test'
8-
import './impute/simpleImputer.test'
9-
import './linear_model/linearRegression.test'
4+
import './dummy/DummyClassifier.test'
5+
import './dummy/DummyRegressor.test'
6+
import './ensemble/VotingClassifier.test'
7+
import './ensemble/VotingRegressor.test'
8+
import './impute/SimpleImputer.test'
9+
import './linear_model/LinearRegression.test'
1010
/* When we figure out why we can't save / load logistic regressions */
1111
// import './linear_model/logisticRegression.test'
1212
import './metrics/metrics.test'
13-
// import './model_selection/kFold.test'
13+
// import './model_selection/KFold.test'
1414
import './model_selection/trainTestSplit.test'
15-
import './naive_bayes/gaussianNaiveBayes.test'
15+
import './naive_bayes/GaussianNB.test'
1616
/* When we figure out how to do expect.extend in karma */
1717
// import './neighbors/bruteNeighborhood.test'
1818
// import './neighbors/cappedMaxHeap.test'
1919
// import './neighbors/kdTree.test'
2020
// import './neighbors/kNeighborsClassifier.test'
2121
// import './neighbors/kNeighborsRegressor.test'
2222
// import './neighbors/metrics.test'
23-
import './pipeline/pipeline.test'
24-
import './preprocessing/labelEncoder.test'
25-
import './preprocessing/maxAbsScaler.test'
26-
import './preprocessing/minMaxScaler.test'
27-
import './preprocessing/normalizer.test'
28-
import './preprocessing/oneHotEncoder.test'
29-
import './preprocessing/ordinalEncoder.test'
30-
import './preprocessing/robustScaler.test'
31-
import './preprocessing/standardScaler.test'
32-
import './svm/linearSVC.test'
33-
import './svm/linearSVR.test'
23+
import './pipeline/Pipeline.test'
24+
import './preprocessing/LabelEncoder.test'
25+
import './preprocessing/MaxAbsScaler.test'
26+
import './preprocessing/MinMaxScaler.test'
27+
import './preprocessing/Normalizer.test'
28+
import './preprocessing/OneHotEncoder.test'
29+
import './preprocessing/OrdinalEncoder.test'
30+
import './preprocessing/RobustScaler.test'
31+
import './preprocessing/StandardScaler.test'
32+
import './svm/LinearSVC.test'
33+
import './svm/LinearSVR.test'
3434
/* When we put back in the SVM code */
3535
// import './svm/SVC.test'
3636
// import './svm/SVR.test'
37-
import './tree/criterion.test'
38-
// import './tree/decisiontree.test'
39-
import './tree/splitter.test'
37+
import './tree/Criterion.test'
38+
// import './tree/DecisionTree.test'
39+
import './tree/Splitter.test'
4040
/* When we use the expect.extend stuff */
4141
// import './jestTensorMatchers.test'

‎src/index.ts

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,74 +12,74 @@
1212
* limitations under the License.
1313
* ==========================================================================
1414
*/
15-
export { KNeighborsRegressor } from './neighbors/kNeighborsRegressor'
15+
export { KNeighborsRegressor } from './neighbors/KNeighborsRegressor'
1616
export {
1717
LinearRegression,
1818
LinearRegressionParams
19-
} from './linear_model/linearRegression'
20-
export { LassoRegression, LassoParams } from './linear_model/lassoRegression'
19+
} from './linear_model/LinearRegression'
20+
export { LassoRegression, LassoParams } from './linear_model/LassoRegression'
2121
export {
2222
RidgeRegression,
2323
RidgeRegressionParams
24-
} from './linear_model/ridgeRegression'
25-
export { ElasticNet, ElasticNetParams } from './linear_model/elasticNet'
24+
} from './linear_model/RidgeRegression'
25+
export { ElasticNet, ElasticNetParams } from './linear_model/ElasticNet'
2626
export {
2727
LogisticRegression,
2828
LogisticRegressionParams
29-
} from './linear_model/logisticRegression'
29+
} from './linear_model/LogisticRegression'
3030
export * as metrics from './metrics/metrics'
31-
export { DummyRegressor, DummyRegressorParams } from './dummy/dummyRegressor'
31+
export { DummyRegressor, DummyRegressorParams } from './dummy/DummyRegressor'
3232
export {
3333
DummyClassifier,
3434
DummyClassifierParams
35-
} from './dummy/dummyClassifier'
36-
export { MinMaxScaler, MinMaxScalerParams } from './preprocessing/minMaxScaler'
35+
} from './dummy/DummyClassifier'
36+
export { MinMaxScaler, MinMaxScalerParams } from './preprocessing/MinMaxScaler'
3737
export {
3838
StandardScaler,
3939
StandardScalerParams
40-
} from './preprocessing/standardScaler'
41-
export { MaxAbsScaler } from './preprocessing/maxAbsScaler'
42-
export { SimpleImputer, SimpleImputerParams } from './impute/simpleImputer'
40+
} from './preprocessing/StandardScaler'
41+
export { MaxAbsScaler } from './preprocessing/MaxAbsScaler'
42+
export { SimpleImputer, SimpleImputerParams } from './impute/SimpleImputer'
4343
export {
4444
OneHotEncoder,
4545
OneHotEncoderParams
46-
} from './preprocessing/oneHotEncoder'
47-
export { LabelEncoder } from './preprocessing/labelEncoder'
46+
} from './preprocessing/OneHotEncoder'
47+
export { LabelEncoder } from './preprocessing/LabelEncoder'
4848
export {
4949
OrdinalEncoder,
5050
OrdinalEncoderParams
51-
} from './preprocessing/ordinalEncoder'
52-
export { Normalizer, NormalizerParams } from './preprocessing/normalizer'
53-
export { Pipeline, PipelineParams, makePipeline } from './pipeline/pipeline'
51+
} from './preprocessing/OrdinalEncoder'
52+
export { Normalizer, NormalizerParams } from './preprocessing/Normalizer'
53+
export { Pipeline, PipelineParams, makePipeline } from './pipeline/Pipeline'
5454
export {
5555
ColumnTransformer,
5656
ColumnTransformerParams
57-
} from './compose/columnTransformer'
58-
export { RobustScaler, RobustScalerParams } from './preprocessing/robustScaler'
59-
export { KMeans, KMeansParams } from './cluster/kmeans'
57+
} from './compose/ColumnTransformer'
58+
export { RobustScaler, RobustScalerParams } from './preprocessing/RobustScaler'
59+
export { KMeans, KMeansParams } from './cluster/KMeans'
6060
export { Scikit1D, Scikit2D, ScikitVecOrMatrix } from './types'
6161
export { dataUrls } from './datasets/datasets'
6262
export {
6363
makeVotingRegressor,
6464
VotingRegressor,
6565
VotingRegressorParams
66-
} from './ensemble/votingRegressor'
66+
} from './ensemble/VotingRegressor'
6767
export {
6868
makeVotingClassifier,
6969
VotingClassifier,
7070
VotingClassifierParams
71-
} from './ensemble/votingClassifier'
72-
export { LinearSVC, LinearSVCParams } from './svm/linearSVC'
73-
export { LinearSVR, LinearSVRParams } from './svm/linearSVR'
71+
} from './ensemble/VotingClassifier'
72+
export { LinearSVC, LinearSVCParams } from './svm/LinearSVC'
73+
export { LinearSVR, LinearSVRParams } from './svm/LinearSVR'
7474

7575
// Comment these out until our libsvm version doesn't ship with fs / path subdependencies
7676
// They were stopping the browser build from being built
7777
// export { SVR, SVRParams } from './svm/SVR'
7878
// export { SVC, SVCParams } from './svm/SVC'
79-
export { GaussianNB } from './naive_bayes/gaussianNaiveBayes'
79+
export { GaussianNB } from './naive_bayes/GaussianNB'
8080
export {
8181
DecisionTreeClassifier,
8282
DecisionTreeClassifierParams,
8383
DecisionTreeRegressor,
8484
DecisionTreeRegressorParams
85-
} from './tree/decisiontree'
85+
} from './tree/DecisionTree'

0 commit comments

Comments
 (0)