From f1ab41a310c32ded4e8734ca39428c94d08cd0f5 Mon Sep 17 00:00:00 2001
From: Omar Zapata <Omar.Zapata@cern.ch>
Date: Tue, 12 Jul 2016 10:03:33 +0200
Subject: [PATCH] TMVA: removed compilation warnings in DNN
---
tmva/tmva/inc/TMVA/NeuralNet.icc | 12 ++++++------
tmva/tmva/src/NeuralNet.cxx | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tmva/tmva/inc/TMVA/NeuralNet.icc b/tmva/tmva/inc/TMVA/NeuralNet.icc
index add97e23cad..68cdb01ea70 100644
--- a/tmva/tmva/inc/TMVA/NeuralNet.icc
+++ b/tmva/tmva/inc/TMVA/NeuralNet.icc
@@ -658,7 +658,7 @@ template <typename LAYERDATA>
if (itDrop == itDropEnd)
break;
- size_t numNodes = layer.numNodes ();
+ size_t _numNodes = layer.numNodes ();
double dropFraction = *itDrop;
double pPrev = 1.0 - dropFractionPrev;
@@ -678,7 +678,7 @@ template <typename LAYERDATA>
*itWeight *= p;
++itWeight;
}
- numNodesPrev = numNodes;
+ numNodesPrev = _numNodes;
dropFractionPrev = dropFraction;
++itDrop;
}
@@ -734,21 +734,21 @@ template <typename LAYERDATA>
{
// fill the dropOut-container
dropContainer.clear ();
- size_t numNodes = inputSize ();
+ size_t _numNodes = inputSize ();
double dropFraction = 0.0;
dropFraction = dropFractions.at (dropIndex);
++dropIndex;
- fillDropContainer (dropContainer, dropFraction, numNodes);
+ fillDropContainer (dropContainer, dropFraction, _numNodes);
for (auto itLayer = begin (m_layers), itLayerEnd = end (m_layers); itLayer != itLayerEnd; ++itLayer, ++dropIndex)
{
auto& layer = *itLayer;
- numNodes = layer.numNodes ();
+ _numNodes = layer.numNodes ();
// how many nodes have to be dropped
dropFraction = 0.0;
if (dropFractions.size () > dropIndex)
dropFraction = dropFractions.at (dropIndex);
- fillDropContainer (dropContainer, dropFraction, numNodes);
+ fillDropContainer (dropContainer, dropFraction, _numNodes);
}
isWeightsForDrop = true;
}
diff --git a/tmva/tmva/src/NeuralNet.cxx b/tmva/tmva/src/NeuralNet.cxx
index 03836478ecb..5e7d7706885 100644
--- a/tmva/tmva/src/NeuralNet.cxx
+++ b/tmva/tmva/src/NeuralNet.cxx
@@ -550,15 +550,15 @@ namespace TMVA
/** \brief prepare the drop-out container given the provided drop-fractions
*
*/
- void Net::fillDropContainer (DropContainer& dropContainer, double dropFraction, size_t numNodes) const
+ void Net::fillDropContainer (DropContainer& dropContainer, double dropFraction, size_t _numNodes) const
{
- size_t numDrops = dropFraction * numNodes;
- if (numDrops >= numNodes) // maintain at least one node
- numDrops = numNodes - 1;
- dropContainer.insert (end (dropContainer), numNodes-numDrops, true); // add the markers for the nodes which are enabled
+ size_t numDrops = dropFraction * _numNodes;
+ if (numDrops >= _numNodes) // maintain at least one node
+ numDrops = _numNodes - 1;
+ dropContainer.insert (end (dropContainer), _numNodes-numDrops, true); // add the markers for the nodes which are enabled
dropContainer.insert (end (dropContainer), numDrops, false); // add the markers for the disabled nodes
// shuffle
- std::random_shuffle (end (dropContainer)-numNodes, end (dropContainer)); // shuffle enabled and disabled markers
+ std::random_shuffle (end (dropContainer)-_numNodes, end (dropContainer)); // shuffle enabled and disabled markers
}
--
GitLab