apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #542 from stereomatchingkiss/fix_name_conflict

Browse Source 
Fix bug--ann constructor hide the name of network.
This commit is contained in:
Marcus Edel
2016-03-04 13:14:38 +01:00
parent 8ffa470043 0616233e73
commit bc2bd172e1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/methods/ann/cnn_impl.hpp
+6 -6
View File
@@ -46,8 +46,8 @@ CNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
// Train the model.
Timer::Start("cnn_optimization");
@@ -83,8 +83,8 @@ CNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
Train(predictors, responses);
}
@@ -112,8 +112,8 @@ CNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
}
template<typename LayerTypes,
src/mlpack/methods/ann/ffn_impl.hpp
+6 -6
View File
@@ -46,8 +46,8 @@ FFN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
// Train the model.
Timer::Start("ffn_optimization");
@@ -83,8 +83,8 @@ FFN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
Train(predictors, responses);
}
@@ -112,8 +112,8 @@ FFN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
}
template<typename LayerTypes,
src/mlpack/methods/ann/rnn_impl.hpp
+6 -6
View File
@@ -48,8 +48,8 @@ RNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
// Train the model.
Timer::Start("rnn_optimization");
@@ -87,8 +87,8 @@ RNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
Train(predictors, responses);
}
@@ -118,8 +118,8 @@ RNN<LayerTypes, OutputLayerType, InitializationRuleType, PerformanceFunction
OutputLayerType>::value,
"The type of outputLayer must be OutputLayerType.");
initializeRule.Initialize(parameter, NetworkSize(network), 1);
NetworkWeights(parameter, network);
initializeRule.Initialize(parameter, NetworkSize(this->network), 1);
NetworkWeights(parameter, this->network);
}
template<typename LayerTypes,