generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor chnges for conflict removal

Browse Source
This commit is contained in:
alexandre benoit 2013-04-29 15:12:44 +02:00
parent 16dea7b90d
commit 9549949228
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/tutorials/contrib/retina_model/retina_model.rst
View File

@ -328,19 +328,19 @@ Once done open the configuration file *RetinaDefaultParameters.xml* generated by
<OPLandIPLparvo> <OPLandIPLparvo>
<colorMode>1</colorMode> <colorMode>1</colorMode>
<normaliseOutput>1</normaliseOutput> <normaliseOutput>1</normaliseOutput>
<photoreceptorsLocalAdaptationSensitivity>7.0e-01</photoreceptorsLocalAdaptationSensitivity> <photoreceptorsLocalAdaptationSensitivity>7.5e-01</photoreceptorsLocalAdaptationSensitivity>
<photoreceptorsTemporalConstant>5.0e-01</photoreceptorsTemporalConstant> <photoreceptorsTemporalConstant>9.0e-01</photoreceptorsTemporalConstant>
<photoreceptorsSpatialConstant>5.3e-01</photoreceptorsSpatialConstant> <photoreceptorsSpatialConstant>5.7e-01</photoreceptorsSpatialConstant>
<horizontalCellsGain>0.</horizontalCellsGain> <horizontalCellsGain>0.01</horizontalCellsGain>
<hcellsTemporalConstant>1.</hcellsTemporalConstant> <hcellsTemporalConstant>0.5</hcellsTemporalConstant>
<hcellsSpatialConstant>7.</hcellsSpatialConstant> <hcellsSpatialConstant>7.</hcellsSpatialConstant>
<ganglionCellsSensitivity>7.0e-01</ganglionCellsSensitivity></OPLandIPLparvo> <ganglionCellsSensitivity>7.5e-01</ganglionCellsSensitivity></OPLandIPLparvo>
<IPLmagno> <IPLmagno>
<normaliseOutput>1</normaliseOutput> <normaliseOutput>1</normaliseOutput>
<parasolCells_beta>0.</parasolCells_beta> <parasolCells_beta>0.</parasolCells_beta>
<parasolCells_tau>0.</parasolCells_tau> <parasolCells_tau>0.</parasolCells_tau>
<parasolCells_k>7.</parasolCells_k> <parasolCells_k>7.</parasolCells_k>
<amacrinCellsTemporalCutFrequency>1.2e+00</amacrinCellsTemporalCutFrequency> <amacrinCellsTemporalCutFrequency>2.0e+00</amacrinCellsTemporalCutFrequency>
<V0CompressionParameter>9.5e-01</V0CompressionParameter> <V0CompressionParameter>9.5e-01</V0CompressionParameter>
<localAdaptintegration_tau>0.</localAdaptintegration_tau> <localAdaptintegration_tau>0.</localAdaptintegration_tau>
<localAdaptintegration_k>7.</localAdaptintegration_k></IPLmagno> <localAdaptintegration_k>7.</localAdaptintegration_k></IPLmagno>

2
doc/tutorials/definitions/tocDefinitions.rst
View File

@ -7,6 +7,6 @@
.. |Author_ArtemM| unicode:: Artem U+0020 Myagkov .. |Author_ArtemM| unicode:: Artem U+0020 Myagkov
.. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a .. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a
.. |Author_EduardF| unicode:: Eduard U+0020 Feicho .. |Author_EduardF| unicode:: Eduard U+0020 Feicho
.. |Author_AlexB| unicode:: Alexandre U+0020 Benoit .. |Author_AlexB| unicode:: Alexandre U+0020 Benoit

2
modules/contrib/doc/retina/index.rst
View File

@ -367,7 +367,7 @@ Parameters structure for better clarity, check explenations on the comments of m
{};// default setup {};// default setup
bool normaliseOutput; bool normaliseOutput;
float parasolCells_beta, parasolCells_tau, parasolCells_k, amacrinCellsTemporalCutFrequency, V0CompressionParameter, localAdaptintegration_tau, localAdaptintegration_k; float parasolCells_beta, parasolCells_tau, parasolCells_k, amacrinCellsTemporalCutFrequency, V0CompressionParameter, localAdaptintegration_tau, localAdaptintegration_k;
}; };
struct OPLandIplParvoParameters OPLandIplParvo; struct OPLandIplParvoParameters OPLandIplParvo;
struct IplMagnoParameters IplMagno; struct IplMagnoParameters IplMagno;
}; };

14
modules/contrib/include/opencv2/contrib/retina.hpp
View File

@ -119,13 +119,13 @@ public:
struct OPLandIplParvoParameters{ // Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters struct OPLandIplParvoParameters{ // Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters
OPLandIplParvoParameters():colorMode(true), OPLandIplParvoParameters():colorMode(true),
normaliseOutput(true), normaliseOutput(true),
photoreceptorsLocalAdaptationSensitivity(0.7f), photoreceptorsLocalAdaptationSensitivity(0.75f),
photoreceptorsTemporalConstant(0.5f), photoreceptorsTemporalConstant(0.9f),
photoreceptorsSpatialConstant(0.53f), photoreceptorsSpatialConstant(0.57f),
horizontalCellsGain(0.0f), horizontalCellsGain(0.01f),
hcellsTemporalConstant(1.f), hcellsTemporalConstant(0.5f),
hcellsSpatialConstant(7.f), hcellsSpatialConstant(7.f),
ganglionCellsSensitivity(0.7f){};// default setup ganglionCellsSensitivity(0.75f){};// default setup
bool colorMode, normaliseOutput; bool colorMode, normaliseOutput;
float photoreceptorsLocalAdaptationSensitivity, photoreceptorsTemporalConstant, photoreceptorsSpatialConstant, horizontalCellsGain, hcellsTemporalConstant, hcellsSpatialConstant, ganglionCellsSensitivity; float photoreceptorsLocalAdaptationSensitivity, photoreceptorsTemporalConstant, photoreceptorsSpatialConstant, horizontalCellsGain, hcellsTemporalConstant, hcellsSpatialConstant, ganglionCellsSensitivity;
}; };
@ -135,7 +135,7 @@ public:
parasolCells_beta(0.f), parasolCells_beta(0.f),
parasolCells_tau(0.f), parasolCells_tau(0.f),
parasolCells_k(7.f), parasolCells_k(7.f),
amacrinCellsTemporalCutFrequency(1.2f), amacrinCellsTemporalCutFrequency(2.0f),
V0CompressionParameter(0.95f), V0CompressionParameter(0.95f),
localAdaptintegration_tau(0.f), localAdaptintegration_tau(0.f),
localAdaptintegration_k(7.f){};// default setup localAdaptintegration_k(7.f){};// default setup

1
modules/contrib/src/retina.cpp
View File

@ -408,7 +408,6 @@ void RetinaImpl::setup(cv::Retina::RetinaParameters newConfiguration)
setupOPLandIPLParvoChannel(_retinaParameters.OPLandIplParvo.colorMode, _retinaParameters.OPLandIplParvo.normaliseOutput, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.photoreceptorsTemporalConstant, _retinaParameters.OPLandIplParvo.photoreceptorsSpatialConstant, _retinaParameters.OPLandIplParvo.horizontalCellsGain, _retinaParameters.OPLandIplParvo.hcellsTemporalConstant, _retinaParameters.OPLandIplParvo.hcellsSpatialConstant, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity); setupOPLandIPLParvoChannel(_retinaParameters.OPLandIplParvo.colorMode, _retinaParameters.OPLandIplParvo.normaliseOutput, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.photoreceptorsTemporalConstant, _retinaParameters.OPLandIplParvo.photoreceptorsSpatialConstant, _retinaParameters.OPLandIplParvo.horizontalCellsGain, _retinaParameters.OPLandIplParvo.hcellsTemporalConstant, _retinaParameters.OPLandIplParvo.hcellsSpatialConstant, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity);
setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency,_retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k); setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency,_retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);
} }
const std::string RetinaImpl::printSetup() const std::string RetinaImpl::printSetup()

2
samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
View File

@ -136,7 +136,7 @@ int main(int argc, char* argv[]) {
} }
}catch(cv::Exception e) }catch(cv::Exception e)
{ {
std::cerr<<"Error using Retina : "<<e.what()<<std::endl; std::cerr<<"Error using Retina or end of video sequence reached : "<<e.what()<<std::endl;
} }
// Program end message // Program end message