Skip to content

Refactor Method Classes #12

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor Method Classes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
105 changes: 105 additions & 0 deletions tmva/tmva/inc/TMVA/StringUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@

#ifndef ROOT_TMVA_StringUtils
#define ROOT_TMVA_StringUtils

#include "TString.h"
#include "TObjString.h"
#include <sstream>

namespace TMVA{

////////////////////////////////////////////////////////////////////////////////
inline TString fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key)
{
key.ToUpper();
std::map<TString, TString>::const_iterator it = keyValueMap.find(key);
if (it == keyValueMap.end()) {
return TString("");
}
return it->second;
}

////////////////////////////////////////////////////////////////////////////////
template <typename T> inline
T fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key, T defaultValue);

////////////////////////////////////////////////////////////////////////////////
template <> inline
int fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key, int defaultValue)
{
TString value(fetchValueUtils(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atoi();
}

////////////////////////////////////////////////////////////////////////////////
template <> inline
double fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key, double defaultValue)
{
TString value(fetchValueUtils(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atof();
}

////////////////////////////////////////////////////////////////////////////////
template <> inline
TString fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key, TString defaultValue)
{
TString value(fetchValueUtils(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value;
}

////////////////////////////////////////////////////////////////////////////////
template <> inline
bool fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key, bool defaultValue)
{
TString value(fetchValueUtils(keyValueMap, key));
if (value == "") {
return defaultValue;
}

value.ToUpper();
if (value == "TRUE" || value == "T" || value == "1") {
return true;
}

return false;
}

////////////////////////////////////////////////////////////////////////////////
template <> inline
std::vector<double> fetchValueUtils(const std::map<TString, TString> &keyValueMap, TString key,
std::vector<double> defaultValue)
{
TString parseString(fetchValueUtils(keyValueMap, key));
if (parseString == "") {
return defaultValue;
}

parseString.ToUpper();
std::vector<double> values;

const TString tokenDelim("+");
TObjArray *tokenStrings = parseString.Tokenize(tokenDelim);
TIter nextToken(tokenStrings);
TObjString *tokenString = (TObjString *)nextToken();
for (; tokenString != NULL; tokenString = (TObjString *)nextToken()) {
std::stringstream sstr;
double currentValue;
sstr << tokenString->GetString().Data();
sstr >> currentValue;
values.push_back(currentValue);
}
return values;
}

}

#endif
112 changes: 11 additions & 101 deletions tmva/tmva/src/MethodDL.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "TMVA/ClassifierFactory.h"
#include "TMVA/MethodDL.h"
#include "TMVA/Types.h"
#include "TMVA/StringUtils.h"
#include "TMVA/DNN/TensorDataLoader.h"
#include "TMVA/DNN/Functions.h"
#include "TMVA/DNN/DLMinimizers.h"
Expand All @@ -55,97 +56,6 @@ using TMVA::DNN::EOutputFunction;

namespace TMVA {

////////////////////////////////////////////////////////////////////////////////
TString fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key)
{
key.ToUpper();
std::map<TString, TString>::const_iterator it = keyValueMap.find(key);
if (it == keyValueMap.end()) {
return TString("");
}
return it->second;
}

////////////////////////////////////////////////////////////////////////////////
template <typename T>
T fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key, T defaultValue);

////////////////////////////////////////////////////////////////////////////////
template <>
int fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key, int defaultValue)
{
TString value(fetchValueTmp(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atoi();
}

////////////////////////////////////////////////////////////////////////////////
template <>
double fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key, double defaultValue)
{
TString value(fetchValueTmp(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atof();
}

////////////////////////////////////////////////////////////////////////////////
template <>
TString fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key, TString defaultValue)
{
TString value(fetchValueTmp(keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value;
}

////////////////////////////////////////////////////////////////////////////////
template <>
bool fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key, bool defaultValue)
{
TString value(fetchValueTmp(keyValueMap, key));
if (value == "") {
return defaultValue;
}

value.ToUpper();
if (value == "TRUE" || value == "T" || value == "1") {
return true;
}

return false;
}

////////////////////////////////////////////////////////////////////////////////
template <>
std::vector<double> fetchValueTmp(const std::map<TString, TString> &keyValueMap, TString key,
std::vector<double> defaultValue)
{
TString parseString(fetchValueTmp(keyValueMap, key));
if (parseString == "") {
return defaultValue;
}

parseString.ToUpper();
std::vector<double> values;

const TString tokenDelim("+");
TObjArray *tokenStrings = parseString.Tokenize(tokenDelim);
TIter nextToken(tokenStrings);
TObjString *tokenString = (TObjString *)nextToken();
for (; tokenString != NULL; tokenString = (TObjString *)nextToken()) {
std::stringstream sstr;
double currentValue;
sstr << tokenString->GetString().Data();
sstr >> currentValue;
values.push_back(currentValue);
}
return values;
}

////////////////////////////////////////////////////////////////////////////////
void MethodDL::DeclareOptions()
Expand Down Expand Up @@ -326,23 +236,23 @@ void MethodDL::ProcessOptions()
for (auto &block : strategyKeyValues) {
TTrainingSettings settings;

settings.convergenceSteps = fetchValueTmp(block, "ConvergenceSteps", 100);
settings.batchSize = fetchValueTmp(block, "BatchSize", 30);
settings.maxEpochs = fetchValueTmp(block, "MaxEpochs", 2000);
settings.testInterval = fetchValueTmp(block, "TestRepetitions", 7);
settings.weightDecay = fetchValueTmp(block, "WeightDecay", 0.0);
settings.learningRate = fetchValueTmp(block, "LearningRate", 1e-5);
settings.momentum = fetchValueTmp(block, "Momentum", 0.3);
settings.dropoutProbabilities = fetchValueTmp(block, "DropConfig", std::vector<Double_t>());
settings.convergenceSteps = fetchValueUtils(block, "ConvergenceSteps", 100);
settings.batchSize = fetchValueUtils(block, "BatchSize", 30);
settings.maxEpochs = fetchValueUtils(block, "MaxEpochs", 2000);
settings.testInterval = fetchValueUtils(block, "TestRepetitions", 7);
settings.weightDecay = fetchValueUtils(block, "WeightDecay", 0.0);
settings.learningRate = fetchValueUtils(block, "LearningRate", 1e-5);
settings.momentum = fetchValueUtils(block, "Momentum", 0.3);
settings.dropoutProbabilities = fetchValueUtils(block, "DropConfig", std::vector<Double_t>());

TString regularization = fetchValueTmp(block, "Regularization", TString("NONE"));
TString regularization = fetchValueUtils(block, "Regularization", TString("NONE"));
if (regularization == "L1") {
settings.regularization = DNN::ERegularization::kL1;
} else if (regularization == "L2") {
settings.regularization = DNN::ERegularization::kL2;
}

TString strMultithreading = fetchValueTmp(block, "Multithreading", TString("True"));
TString strMultithreading = fetchValueUtils(block, "Multithreading", TString("True"));

if (strMultithreading.BeginsWith("T")) {
settings.multithreading = true;
Expand Down
122 changes: 10 additions & 112 deletions tmva/tmva/src/MethodDNN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Deep Neural Network Implementation.
#include "TMVA/MethodBase.h"
#include "TMVA/Timer.h"
#include "TMVA/Types.h"
#include "TMVA/StringUtils.h"
#include "TMVA/Tools.h"
#include "TMVA/Config.h"
#include "TMVA/Ranking.h"
Expand Down Expand Up @@ -303,109 +304,6 @@ auto TMVA::MethodDNN::ParseKeyValueString(TString parseString,
return blockKeyValues;
}

////////////////////////////////////////////////////////////////////////////////

TString fetchValue (const std::map<TString, TString>& keyValueMap, TString key)
{
key.ToUpper ();
std::map<TString, TString>::const_iterator it = keyValueMap.find (key);
if (it == keyValueMap.end()) {
return TString ("");
}
return it->second;
}

////////////////////////////////////////////////////////////////////////////////

template <typename T>
T fetchValue(const std::map<TString,TString>& keyValueMap,
TString key,
T defaultValue);

////////////////////////////////////////////////////////////////////////////////

template <>
int fetchValue(const std::map<TString,TString>& keyValueMap,
TString key,
int defaultValue)
{
TString value (fetchValue (keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atoi ();
}

////////////////////////////////////////////////////////////////////////////////

template <>
double fetchValue (const std::map<TString,TString>& keyValueMap,
TString key, double defaultValue)
{
TString value (fetchValue (keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value.Atof ();
}

////////////////////////////////////////////////////////////////////////////////

template <>
TString fetchValue (const std::map<TString,TString>& keyValueMap,
TString key, TString defaultValue)
{
TString value (fetchValue (keyValueMap, key));
if (value == "") {
return defaultValue;
}
return value;
}

////////////////////////////////////////////////////////////////////////////////

template <>
bool fetchValue (const std::map<TString,TString>& keyValueMap,
TString key, bool defaultValue)
{
TString value (fetchValue (keyValueMap, key));
if (value == "") {
return defaultValue;
}
value.ToUpper ();
if (value == "TRUE" || value == "T" || value == "1") {
return true;
}
return false;
}

////////////////////////////////////////////////////////////////////////////////

template <>
std::vector<double> fetchValue(const std::map<TString, TString> & keyValueMap,
TString key,
std::vector<double> defaultValue)
{
TString parseString (fetchValue (keyValueMap, key));
if (parseString == "") {
return defaultValue;
}
parseString.ToUpper ();
std::vector<double> values;

const TString tokenDelim ("+");
TObjArray* tokenStrings = parseString.Tokenize (tokenDelim);
TIter nextToken (tokenStrings);
TObjString* tokenString = (TObjString*)nextToken ();
for (; tokenString != NULL; tokenString = (TObjString*)nextToken ()) {
std::stringstream sstr;
double currentValue;
sstr << tokenString->GetString ().Data ();
sstr >> currentValue;
values.push_back (currentValue);
}
return values;
}

////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -557,16 +455,16 @@ void TMVA::MethodDNN::ProcessOptions()
for (auto& block : strategyKeyValues) {
TTrainingSettings settings;

settings.convergenceSteps = fetchValue(block, "ConvergenceSteps", 100);
settings.batchSize = fetchValue(block, "BatchSize", 30);
settings.testInterval = fetchValue(block, "TestRepetitions", 7);
settings.weightDecay = fetchValue(block, "WeightDecay", 0.0);
settings.learningRate = fetchValue(block, "LearningRate", 1e-5);
settings.momentum = fetchValue(block, "Momentum", 0.3);
settings.dropoutProbabilities = fetchValue(block, "DropConfig",
settings.convergenceSteps = fetchValueUtils(block, "ConvergenceSteps", 100);
settings.batchSize = fetchValueUtils(block, "BatchSize", 30);
settings.testInterval = fetchValueUtils(block, "TestRepetitions", 7);
settings.weightDecay = fetchValueUtils(block, "WeightDecay", 0.0);
settings.learningRate = fetchValueUtils(block, "LearningRate", 1e-5);
settings.momentum = fetchValueUtils(block, "Momentum", 0.3);
settings.dropoutProbabilities = fetchValueUtils(block, "DropConfig",
std::vector<Double_t>());

TString regularization = fetchValue(block, "Regularization",
TString regularization = fetchValueUtils(block, "Regularization",
TString ("NONE"));
if (regularization == "L1") {
settings.regularization = DNN::ERegularization::kL1;
Expand All @@ -576,7 +474,7 @@ void TMVA::MethodDNN::ProcessOptions()
settings.regularization = DNN::ERegularization::kNone;
}

TString strMultithreading = fetchValue(block, "Multithreading",
TString strMultithreading = fetchValueUtils(block, "Multithreading",
TString ("True"));
if (strMultithreading.BeginsWith ("T")) {
settings.multithreading = true;
Expand Down