Skip to content

JsMVA v1.5 #247

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

Closed
qati wants to merge 14 commits into from
Closed

JsMVA v1.5 #247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
50159b3
added GetCorrelation matrix to TMVA::DataLoader
qati Jul 19, 2016
6900796
interactive training in jupyter envrionment for all method. MLP, DNN,…
qati Jul 19, 2016
bd73d1a
Added interactive module for Jupyter notebook environment
qati Jul 19, 2016
81acead
Fixes in interactive training in jupyter integration layer
qati Jul 20, 2016
f12c04e
JsMVA: TMVA's method rewriter; 'overloaded' methods: Factory::TrainAl…
qati Jul 20, 2016
7fd8d9f
sync with qati/GSOC16/src
qati Jul 25, 2016
557652d
sync with qati/GSOC16/src
qati Jul 28, 2016
5f71cd8
Sync with qati/GSOC16 repo: DNN designer, output transformations, DNN…
qati Sep 13, 2016
233e094
code clean up, documentation
qati Sep 14, 2016
8db6ea6
updated structure, minor bug fix
qati Sep 15, 2016
c7ce819
IPythonInteractive doc and test
qati Sep 18, 2016
c33940b
removed Factory.py/ChangeCallOriginalCrossValidate, added noOutput op…
qati Sep 18, 2016
21e1275
Enric's output transformer
qati Sep 19, 2016
49a495e
removed unnecessary lines
qati Sep 19, 2016
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
Fixes in interactive training in jupyter integration layer
  • Loading branch information
@qati
qati committed Sep 19, 2016
commit 81acead5f2dfff54c8b9627040d85c71962bf201
4 changes: 2 additions & 2 deletions tmva/tmva/inc/TMVA/FitterBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ namespace TMVA {
TString fClassName; // remove TMVA:: from TObject name

// variables needed by JsMVA
UInt_t *fIPyCurrentIter=nullptr, *fIPyMaxIter=nullptr;
bool* fExitFromTraining;
UInt_t *fIPyCurrentIter = nullptr, *fIPyMaxIter = nullptr;
bool* fExitFromTraining = nullptr;

ClassDef(FitterBase,0); // Baseclass for fitters
};
Expand Down
4 changes: 2 additions & 2 deletions tmva/tmva/inc/TMVA/SVWorkingSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ namespace TMVA {
mutable MsgLogger* fLogger; //! message logger

// variables for JsMVA
UInt_t *fIPyCurrentIter=nullptr;
bool * fExitFromTraining;
UInt_t *fIPyCurrentIter = nullptr;
bool * fExitFromTraining = nullptr;

void SetIndex( TMVA::SVEvent* );
};
Expand Down
4 changes: 2 additions & 2 deletions tmva/tmva/inc/TMVA/SimulatedAnnealing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ namespace TMVA {
Double_t fProgress;

// variables for JsMVA
UInt_t *fIPyCurrentIter=nullptr;
bool * fExitFromTraining;
UInt_t *fIPyCurrentIter = nullptr;
bool * fExitFromTraining = nullptr;

ClassDef(SimulatedAnnealing,0); // Base class for Simulated Annealing fitting
};
Expand Down
1 change: 0 additions & 1 deletion tmva/tmva/src/MethodCFMlpANN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ void TMVA::MethodCFMlpANN::Train( void )
Int_t *nodes = new Int_t[nlayers];
Int_t ncycles(fNcycles);


for (Int_t i=0; i<nlayers; i++) nodes[i] = fNodes[i]; // full copy of class member

if (fYNN != 0) {
Expand Down
2 changes: 1 addition & 1 deletion tmva/tmva/src/MethodCuts.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ void TMVA::MethodCuts::Train( void )
Log() << kFATAL << "Wrong fit method: " << fFitMethod << Endl;
}

fitter->SetIPythonInteractive(&fExitFromTraining, &fIPyMaxIter, &fIPyCurrentIter);
if (fInteractive) fitter->SetIPythonInteractive(&fExitFromTraining, &fIPyMaxIter, &fIPyCurrentIter);

fitter->CheckForUnusedOptions();

Expand Down
8 changes: 4 additions & 4 deletions tmva/tmva/src/MethodDNN.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,10 @@ void TMVA::MethodDNN::Train()

Log() << kINFO << "Using Standard Implementation.";

if (fInteractive && fInteractive->NotInitialized()){
std::vector<TString> titles = {"Error on training set", "Error on test set"};
fInteractive->Init(titles);
}
if (fInteractive && fInteractive->NotInitialized()){
std::vector<TString> titles = {"Error on training set", "Error on test set"};
fInteractive->Init(titles);
}

std::vector<Pattern> trainPattern;
std::vector<Pattern> testPattern;
Expand Down
2 changes: 1 addition & 1 deletion tmva/tmva/src/MethodSVM.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ void TMVA::MethodSVM::Train()
Timer timer( GetName() );
Log() << kINFO << "Sorry, no computing time forecast available for SVM, please wait ..." << Endl;

fWgSet->SetIPythonInteractive(&fExitFromTraining, &fIPyCurrentIter);
if (fInteractive) fWgSet->SetIPythonInteractive(&fExitFromTraining, &fIPyCurrentIter);

fWgSet->Train(fMaxIter);

Expand Down
2 changes: 1 addition & 1 deletion tmva/tmva/src/SVWorkingSet.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ void TMVA::SVWorkingSet::Train(UInt_t nMaxIter)

while ((numChanged > 0) || (examineAll > 0)) {
if (fIPyCurrentIter) *fIPyCurrentIter = numit;
if (*fExitFromTraining) break;
if (fExitFromTraining && *fExitFromTraining) break;
numChanged = 0;
if (examineAll) {
for (idIter = fInputData->begin(); idIter!=fInputData->end(); idIter++){
Expand Down
6 changes: 4 additions & 2 deletions tmva/tmva/src/SimulatedAnnealingFitter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,10 @@ Double_t TMVA::SimulatedAnnealingFitter::Run( std::vector<Double_t>& pars )
fTemperatureScale, fAdaptiveSpeed, fTemperatureAdaptiveStep,
fUseDefaultScale, fUseDefaultTemperature );

if (fIPyMaxIter) *fIPyMaxIter = fMaxCalls;
sa.SetIPythonInteractive(fExitFromTraining, fIPyCurrentIter);
if (fIPyMaxIter){
*fIPyMaxIter = fMaxCalls;
sa.SetIPythonInteractive(fExitFromTraining, fIPyCurrentIter);
}
// minimise
Double_t fcn = sa.Minimize( pars );

Expand Down