Skip to content

TMVA various fixes #610

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

Merged
lmoneta merged 8 commits into from
Jun 7, 2017
Merged

TMVA various fixes #610

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d9ba3b
Take weights into consideration in text output.
ashlaban Jun 4, 2017
284f1b5
Add doc and explicit multiclass support for Factory:GetROCIntegral
ashlaban Jun 6, 2017
d2714c2
TMVA Multiclass: Disable ranking by effS*purS
ashlaban Jun 6, 2017
485e044
Add output when using event weights with DNN
ashlaban Jun 6, 2017
b6804be
Deprecate DNN arch=STANDARD, early exist check DNN arch=CPU/GPU
ashlaban Jun 6, 2017
2b271c7
clang-format
ashlaban Jun 6, 2017
4540b9f
clang-format
ashlaban Jun 6, 2017
dc66ecc
more clang-format
ashlaban Jun 7, 2017
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
Prev Previous commit
Next Next commit
TMVA Multiclass: Disable ranking by effS*purS 
The calculation is very exensive so will be disabled for now.
The plan is to add this as a configurable option later.
  • Loading branch information
@ashlaban
ashlaban committed Jun 6, 2017
commit d2714c2873f653dc84dd78a11a5c9935ff37ab02
71 changes: 38 additions & 33 deletions tmva/tmva/src/Factory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,10 +1364,12 @@ void TMVA::Factory::EvaluateAllMethods( void )
doMulticlass = kTRUE;
Log() << kINFO << "Evaluate multiclass classification method: " << theMethod->GetMethodName() << Endl;

theMethod->TestMulticlass();

// This part uses a genetic alg. to evaluate the optimal sig eff * sig pur.
// This is why it is disabled for now.
// Find approximate optimal working point w.r.t. signalEfficiency * signalPurity.
multiclass_testEff.push_back(theMethod->GetMulticlassEfficiency(multiclass_testPur));
// theMethod->TestMulticlass(); // This is where the actual GA calc is done
// multiclass_testEff.push_back(theMethod->GetMulticlassEfficiency(multiclass_testPur));

// Confusion matrix at three background efficiency levels
multiclass_testConfusionEffB01.push_back(theMethod->GetMulticlassConfusionMatrix(0.01, Types::kTesting));
Expand Down Expand Up @@ -1730,37 +1732,40 @@ void TMVA::Factory::EvaluateAllMethods( void )
TString hLine =
"-------------------------------------------------------------------------------------------------------";

// --- Acheivable signal efficiency * signal purity
// --------------------------------------------------------------------
Log() << kINFO << Endl;
Log() << kINFO << "Evaluation results ranked by best signal efficiency times signal purity " << Endl;
Log() << kINFO << hLine << Endl;

// iterate over methods and evaluate
for (MVector::iterator itrMethod = methods->begin(); itrMethod != methods->end(); itrMethod++) {
MethodBase *theMethod = dynamic_cast<MethodBase *>(*itrMethod);
if (theMethod == 0) {
continue;
}

TString header = "DataSet Name MVA Method ";
for (UInt_t icls = 0; icls < theMethod->fDataSetInfo.GetNClasses(); ++icls) {
header += Form("%-12s ", theMethod->fDataSetInfo.GetClassInfo(icls)->GetName());
}

Log() << kINFO << header << Endl;
Log() << kINFO << hLine << Endl;
for (Int_t i = 0; i < nmeth_used[0]; i++) {
TString res = Form("[%-14s] %-15s", theMethod->fDataSetInfo.GetName(), (const char *)mname[0][i]);
for (UInt_t icls = 0; icls < theMethod->fDataSetInfo.GetNClasses(); ++icls) {
res += Form("%#1.3f ", (multiclass_testEff[i][icls]) * (multiclass_testPur[i][icls]));
}
Log() << kINFO << res << Endl;
}

Log() << kINFO << hLine << Endl;
Log() << kINFO << Endl;
}
// This part uses a genetic alg. to evaluate the optimal sig eff * sig pur.
// This is why it is disabled for now.
//
// // --- Acheivable signal efficiency * signal purity
// // --------------------------------------------------------------------
// Log() << kINFO << Endl;
// Log() << kINFO << "Evaluation results ranked by best signal efficiency times signal purity " << Endl;
// Log() << kINFO << hLine << Endl;

// // iterate over methods and evaluate
// for (MVector::iterator itrMethod = methods->begin(); itrMethod != methods->end(); itrMethod++) {
// MethodBase *theMethod = dynamic_cast<MethodBase *>(*itrMethod);
// if (theMethod == 0) {
// continue;
// }

// TString header = "DataSet Name MVA Method ";
// for (UInt_t icls = 0; icls < theMethod->fDataSetInfo.GetNClasses(); ++icls) {
// header += Form("%-12s ", theMethod->fDataSetInfo.GetClassInfo(icls)->GetName());
// }

// Log() << kINFO << header << Endl;
// Log() << kINFO << hLine << Endl;
// for (Int_t i = 0; i < nmeth_used[0]; i++) {
// TString res = Form("[%-14s] %-15s", theMethod->fDataSetInfo.GetName(), (const char *)mname[0][i]);
// for (UInt_t icls = 0; icls < theMethod->fDataSetInfo.GetNClasses(); ++icls) {
// res += Form("%#1.3f ", (multiclass_testEff[i][icls]) * (multiclass_testPur[i][icls]));
// }
// Log() << kINFO << res << Endl;
// }

// Log() << kINFO << hLine << Endl;
// Log() << kINFO << Endl;
// }

// --- 1 vs Rest ROC AUC, signal efficiency @ given background efficiency
// --------------------------------------------------------------------
Expand Down