Commit b76379c1 authored by Jussi Lindgren's avatar Jussi Lindgren

Plugins: Fixed incorrect uses of TParameterHandlers in classifier training

parent 3c15617f
......@@ -110,7 +110,7 @@ boolean CAlgorithmClassifierOneVsOne::train(const IFeatureVectorSet& rFeatureVec
TParameterHandler < CIdentifier *> ip_pClassificationAlgorithm(m_pDecisionStrategyAlgorithm->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameterId_AlgorithmIdentifier));
ip_pClassificationAlgorithm = &m_oSubClassifierAlgorithmIdentifier;
TParameterHandler <uint32> ip_pClassCount(m_pDecisionStrategyAlgorithm->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
TParameterHandler <uint64> ip_pClassCount(m_pDecisionStrategyAlgorithm->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
ip_pClassCount = l_ui32ClassCount;
m_pDecisionStrategyAlgorithm->process(OVP_Algorithm_Classifier_Pairwise_InputTriggerId_Parametrize);
......
......@@ -69,7 +69,7 @@ namespace OpenViBEPlugins
rAlgorithmPrototype.addInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameterId_AlgorithmIdentifier, "Classification Algorithm", OpenViBE::Kernel::ParameterType_Identifier);
rAlgorithmPrototype.addInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassificationOutputs,
"Classification Outputs", OpenViBE::Kernel::ParameterType_Pointer);
rAlgorithmPrototype.addInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount, "Classification Algorithm", OpenViBE::Kernel::ParameterType_UInteger);
rAlgorithmPrototype.addInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount, "Class Count", OpenViBE::Kernel::ParameterType_UInteger);
rAlgorithmPrototype.addOutputParameter(OVP_Algorithm_Classifier_OutputParameter_ProbabilityVector, "Probability Vector", OpenViBE::Kernel::ParameterType_Matrix);
......
......@@ -37,8 +37,8 @@ boolean CAlgorithmPairwiseDecisionHT::uninitialize()
boolean CAlgorithmPairwiseDecisionHT::parametrize()
{
TParameterHandler < uint32 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = ip_pClassCount;
TParameterHandler < uint64 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = static_cast<uint32>(ip_pClassCount);
return true;
}
......
......@@ -32,8 +32,8 @@ boolean CAlgorithmPairwiseDecisionVoting::uninitialize()
boolean CAlgorithmPairwiseDecisionVoting::parametrize()
{
TParameterHandler < uint32 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = ip_pClassCount;
TParameterHandler < uint64 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = static_cast<uint32>(ip_pClassCount);
return true;
}
......
......@@ -33,8 +33,8 @@ boolean CAlgorithmPairwiseStrategyPKPD::uninitialize()
boolean CAlgorithmPairwiseStrategyPKPD::parametrize()
{
TParameterHandler < uint32 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = ip_pClassCount;
TParameterHandler < uint64 > ip_pClassCount(this->getInputParameter(OVP_Algorithm_Classifier_Pairwise_InputParameter_ClassCount));
m_ui32ClassCount = static_cast<uint32>(ip_pClassCount);
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment