Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR to fix issue #260 #261

Merged
merged 8 commits into from
Sep 6, 2022
Merged

PR to fix issue #260 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
17b7b39
Initial version of MLP support using DJL
nuwangunasekara Jul 3, 2022
a120daf
Initial version of CAND
nuwangunasekara Jul 3, 2022
283a6ff
Unit tests for CAND and MLP
nuwangunasekara Jul 31, 2022
38fac44
Add reference and description.
nuwangunasekara Jul 31, 2022
4457873
Rename the package directory to 'deeplearning'
nuwangunasekara Aug 18, 2022
1e15e3a
As per the paper, use the best performing defaults.
nuwangunasekara Aug 18, 2022
bd36e74
Merge branch 'Waikato:master' into master
nuwangunasekara Sep 6, 2022
21edd30
Fixing issue #260
nuwangunasekara Sep 6, 2022
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
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineAdaBoost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
this.lambdaSc.add(0.0);
this.lambdaSw.add(0.0);
this.epsilon.add(0.0);
Expand Down
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineAdaC2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
this.lambdaTP.add(0.0);
this.lambdaTN.add(0.0);
this.lambdaFP.add(0.0);
Expand Down
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineCSB2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
this.lambdaFP.add(0.0);
this.lambdaFN.add(0.0);
this.lambdaSum.add(0.0);
Expand Down
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineRUSBoost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
this.lambdaSc.add(0.0);
this.lambdaPos.add(0.0);
this.lambdaNeg.add(0.0);
Expand Down
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineSMOTEBagging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion moa/src/main/java/moa/classifiers/meta/imbalanced/OnlineUnderOverBagging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ protected void adjustEnsembleSize(int nClasses) {
for (int i = this.nEstimators; i < nClasses; i++) {
this.ensemble.add(this.baseLearner.copy());
this.nEstimators ++;
this.adwinEnsemble.add(new ADWIN());
if (this.driftDetection) {
this.adwinEnsemble.add(new ADWIN());
}
}
}
}
Expand Down