-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix ResultProcessor bug, LogisticRegression bug and missing value conversion bug #1236
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.
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
725199f
Fix some bugs, add some unit tests.
yaeldMS 31bd29c
Fix LR stats bug
yaeldMS 44a1789
Merge branch 'master' into bugfixes
yaeldMS 4db39ca
Undo accidental TermTransform change
yaeldMS 0f7d6de
Sweeper needs to load all components into ComponentCatalog
yaeldMS 944cf23
Rename Mapping.de-de.txt
yaeldMS 3026138
Fix cat transform issue
yaeldMS 58f7e2a
Compare pr baseline only on Windows
yaeldMS 92bb0f5
Merge branch 'master' into bugfixes
yaeldMS e7d2e9e
Move baselines to Common folder
yaeldMS f4b143b
Compare pr baseline only on Windows in another test
yaeldMS e64a447
Code review comment
yaeldMS 7710d9c
Fix ConcatTransform bug
yaeldMS a848fc3
Add baselines for ConcatTransform bug
yaeldMS c20a1b2
Fix another bug in TermTransform
yaeldMS 43a4481
Merge branch 'master' into bugfixes
yaeldMS d261045
NelderMead sweeper default value for FirstBatchSweeper arg
yaeldMS 7f608e1
Add some more unit tests
yaeldMS 745624e
Add more unit tests
yaeldMS 5069a43
Fix unit test baseline, and baseline comparison with tolerance.
yaeldMS b6d5992
Change back MatchWithTolerance method
yaeldMS 068954a
Merge with master
yaeldMS b44d4a6
Fix bad merge
yaeldMS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
test/BaselineOutput/SingleDebug/Command/CommandTrainMlrWithStats-1-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Saving predictor summary |
15 changes: 15 additions & 0 deletions
15
test/BaselineOutput/SingleDebug/Command/CommandTrainMlrWithStats-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
maml.exe Train tr=MultiClassLogisticRegression{maxiter=100 t=- stat=+} loader=TextLoader{col=Label:TX:4 col=Features:R4:0-3 sep=,} data=%Data% out=%Output% seed=1 xf=Term{col=Label} | ||
Automatically adding a MinMax normalization transform, use 'norm=Warn' or 'norm=No' to turn this behavior off. | ||
Beginning optimization | ||
num vars: 15 | ||
improvement criterion: Mean Improvement | ||
L1 regularization selected 11 of 15 weights. | ||
Model trained with 150 training examples. | ||
Residual Deviance: 132.0122 | ||
Null Deviance: 329.5837 | ||
AIC: 154.0122 | ||
Not training a calibrator because it is not needed. | ||
Physical memory usage(MB): %Number% | ||
Virtual memory usage(MB): %Number% | ||
%DateTime% Time elapsed(s): %Number% | ||
|
18 changes: 18 additions & 0 deletions
18
test/BaselineOutput/SingleDebug/Command/CommandTrainMlrWithStats-summary.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
MulticlassLogisticRegression bias and non-zero weights | ||
Iris-setosa+(Bias) 2.265129 | ||
Iris-versicolor+(Bias) 0.7695086 | ||
Iris-virginica+(Bias) -3.034663 | ||
Iris-setosa+f3 -3.180634 | ||
Iris-setosa+f2 -2.88663 | ||
Iris-setosa+f1 0.5392878 | ||
Iris-setosa+f0 -0.03958065 | ||
Iris-versicolor+f1 -0.7073272 | ||
Iris-virginica+f3 3.158146 | ||
Iris-virginica+f2 1.907791 | ||
Iris-virginica+f0 0.01793481 | ||
|
||
*** MODEL STATISTICS SUMMARY *** | ||
Count of training examples: 150 | ||
Residual Deviance: 132.0122 | ||
Null Deviance: 329.5837 | ||
AIC: 154.0122 |
1 change: 1 addition & 0 deletions
1
test/BaselineOutput/SingleDebug/Command/CommandTrainingLrWithStats-1-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Saving predictor summary | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
with latest Eric changes (#1193) you can just use Common folder if files for Debug and Release are same. #Closed |
15 changes: 15 additions & 0 deletions
15
test/BaselineOutput/SingleDebug/Command/CommandTrainingLrWithStats-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
maml.exe Train feat=Num lab=Lab tr=lr{t=- stat=+} loader=text{header+ sep=comma col=Lab:14 col=Num:0,2,4,10-12} data=%Data% out=%Output% | ||
Automatically adding a MinMax normalization transform, use 'norm=Warn' or 'norm=No' to turn this behavior off. | ||
Beginning optimization | ||
num vars: 7 | ||
improvement criterion: Mean Improvement | ||
L1 regularization selected 7 of 7 weights. | ||
Model trained with 32561 training examples. | ||
Residual Deviance: 26705.74 (on 32554 degrees of freedom) | ||
Null Deviance: 35948.08 (on 32560 degrees of freedom) | ||
AIC: 26719.74 | ||
Not training a calibrator because it is not needed. | ||
Physical memory usage(MB): %Number% | ||
Virtual memory usage(MB): %Number% | ||
%DateTime% Time elapsed(s): %Number% | ||
|
15 changes: 15 additions & 0 deletions
15
test/BaselineOutput/SingleDebug/Command/CommandTrainingLrWithStats-summary.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
Linear Binary Classification Predictor non-zero weights | ||
|
||
(Bias) -8.228298 | ||
capital-gain 18.58347 | ||
education-num 5.066041 | ||
hours-per-week 3.946534 | ||
age 3.86064 | ||
capital-loss 2.81616 | ||
fnlwgt 0.7489593 | ||
|
||
*** MODEL STATISTICS SUMMARY *** | ||
Count of training examples: 32561 | ||
Residual Deviance: 26705.74 | ||
Null Deviance: 35948.08 | ||
AIC: 26719.74 |
8 changes: 8 additions & 0 deletions
8
test/BaselineOutput/SingleDebug/FastRank/FastRank-CV-MSM-sparse-sample-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
maml.exe CV tr=FastRank{nl=5 mil=5 lr=0.25 iter=20} threads=- dout=%Output% loader=Text{col=Name:TX:0 col=Label:Num:1 col=Features:Num:~} data=%Data% seed=1 xf=Expr{col=Name expr={x=>right(x, 1)}} | ||
Physical memory usage(MB): %Number% | ||
Virtual memory usage(MB): %Number% | ||
%DateTime% Time elapsed(s): %Number% | ||
|
||
Could not find file '%Data% | ||
Error log has been saved to '%Temp%\%ErrorLog%'. Please refer to https://aka.ms/MLNetIssue if you need assistance. | ||
--- Progress log --- |
Empty file.
83 changes: 83 additions & 0 deletions
83
test/BaselineOutput/SingleDebug/FastRank/FastRank-CV-breast-cancer-out.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
maml.exe CV tr=FastRank{nl=5 mil=5 lr=0.25 iter=20} threads=- dout=%Output% data=%Data% seed=1 | ||
Not adding a normalizer. | ||
Making per-feature arrays | ||
Changing data from row-wise to column-wise | ||
Warning: Skipped 8 instances with missing features during training | ||
Processed 329 instances | ||
Binning and forming Feature objects | ||
Reserved memory for tree learner: 3852 bytes | ||
Starting to train ... | ||
Not training a calibrator because it is not needed. | ||
Not adding a normalizer. | ||
Making per-feature arrays | ||
Changing data from row-wise to column-wise | ||
Warning: Skipped 8 instances with missing features during training | ||
Processed 354 instances | ||
Binning and forming Feature objects | ||
Reserved memory for tree learner: 3816 bytes | ||
Starting to train ... | ||
Not training a calibrator because it is not needed. | ||
TEST POSITIVE RATIO: 0.3702 (134.0/(134.0+228.0)) | ||
Confusion table | ||
||====================== | ||
PREDICTED || positive | negative | Recall | ||
TRUTH ||====================== | ||
positive || 131 | 3 | 0.9776 | ||
negative || 10 | 218 | 0.9561 | ||
||====================== | ||
Precision || 0.9291 | 0.9864 | | ||
OVERALL 0/1 ACCURACY: 0.964088 | ||
LOG LOSS/instance: 0.211336 | ||
Test-set entropy (prior Log-Loss/instance): 0.950799 | ||
LOG-LOSS REDUCTION (RIG): 77.772765 | ||
AUC: 0.983225 | ||
TEST POSITIVE RATIO: 0.3175 (107.0/(107.0+230.0)) | ||
Confusion table | ||
||====================== | ||
PREDICTED || positive | negative | Recall | ||
TRUTH ||====================== | ||
positive || 98 | 9 | 0.9159 | ||
negative || 5 | 225 | 0.9783 | ||
||====================== | ||
Precision || 0.9515 | 0.9615 | | ||
OVERALL 0/1 ACCURACY: 0.958457 | ||
LOG LOSS/instance: 0.137700 | ||
Test-set entropy (prior Log-Loss/instance): 0.901650 | ||
LOG-LOSS REDUCTION (RIG): 84.727964 | ||
AUC: 0.993681 | ||
|
||
OVERALL RESULTS | ||
--------------------------------------- | ||
AUC: 0.988453 (0.0052) | ||
Accuracy: 0.961273 (0.0028) | ||
Positive precision: 0.940267 (0.0112) | ||
Positive recall: 0.946750 (0.0309) | ||
Negative precision: 0.973982 (0.0124) | ||
Negative recall: 0.967201 (0.0111) | ||
Log-loss: 0.174518 (0.0368) | ||
Log-loss reduction: 81.250364 (3.4776) | ||
F1 Score: 0.943030 (0.0097) | ||
AUPRC: 0.962986 (0.0211) | ||
|
||
--------------------------------------- | ||
Physical memory usage(MB): %Number% | ||
Virtual memory usage(MB): %Number% | ||
%DateTime% Time elapsed(s): %Number% | ||
|
||
--- Progress log --- | ||
[1] 'FastTree data preparation' started. | ||
[1] 'FastTree data preparation' finished in %Time%. | ||
[2] 'FastTree in-memory bins initialization' started. | ||
[2] 'FastTree in-memory bins initialization' finished in %Time%. | ||
[3] 'FastTree feature conversion' started. | ||
[3] 'FastTree feature conversion' finished in %Time%. | ||
[4] 'FastTree training' started. | ||
[4] 'FastTree training' finished in %Time%. | ||
[5] 'FastTree data preparation #2' started. | ||
[5] 'FastTree data preparation #2' finished in %Time%. | ||
[6] 'FastTree in-memory bins initialization #2' started. | ||
[6] 'FastTree in-memory bins initialization #2' finished in %Time%. | ||
[7] 'FastTree feature conversion #2' started. | ||
[7] 'FastTree feature conversion #2' finished in %Time%. | ||
[8] 'FastTree training #2' started. | ||
[8] 'FastTree training #2' finished in %Time%. |
4 changes: 4 additions & 0 deletions
4
test/BaselineOutput/SingleDebug/FastRank/FastRank-CV-breast-cancer-rp.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
FastRank | ||
AUC Accuracy Positive precision Positive recall Negative precision Negative recall Log-loss Log-loss reduction F1 Score AUPRC /lr /nl /mil /iter Learner Name Train Dataset Test Dataset Results File Run Time Physical Memory Virtual Memory Command Line Settings | ||
0.988453 0.961273 0.940267 0.94675 0.973982 0.967201 0.174518 81.25037 0.94303 0.962986 0.25 5 5 20 FastRank %Data% %Output% 99 0 0 maml.exe CV tr=FastRank{nl=5 mil=5 lr=0.25 iter=20} threads=- dout=%Output% data=%Data% seed=1 /lr:0.25;/nl:5;/mil:5;/iter:20 | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heh heh. Whoops! #Resolved