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

made random generators of MLL classes depended on default rng (theRNG) (#205).

Browse Source
This commit is contained in:
Maria Dimashova
2010-11-29 14:04:08 +00:00
parent 7860d52e14
commit c104cdce96
10 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ml/src/ann_mlp.cpp
View File

@@ -95,7 +95,7 @@ CvANN_MLP::CvANN_MLP()
layer_sizes = wbuf = 0;
min_val = max_val = min_val1 = max_val1 = 0.;
weights = 0;
rng = cvRNG(-1);
rng = &cv::theRNG();
default_model_name = "my_nn";
clear();
}
@@ -108,7 +108,7 @@ CvANN_MLP::CvANN_MLP( const CvMat* _layer_sizes,
layer_sizes = wbuf = 0;
min_val = max_val = min_val1 = max_val1 = 0.;
weights = 0;
rng = cvRNG(-1);
rng = &cv::theRNG();
default_model_name = "my_nn";
create( _layer_sizes, _activ_func, _f_param1, _f_param2 );
}
@@ -190,7 +190,7 @@ void CvANN_MLP::init_weights()
double s = 0;
for( k = 0; k <= n1; k++ )
{
val = cvRandReal(&rng)*2-1.;
val = rng->uniform(0., 1.)*2-1.;
w[k*n2 + j] = val;
s += fabs(val);
}
@@ -928,8 +928,8 @@ int CvANN_MLP::train_backprop( CvVectors x0, CvVectors u, const double* sw )
for( i = 0; i < count; i++ )
{
int tt;
j = (unsigned)cvRandInt(&rng) % count;
k = (unsigned)cvRandInt(&rng) % count;
j = (*rng)(count);
k = (*rng)(count);
CV_SWAP( _idx->data.i[j], _idx->data.i[k], tt );
}
}
@@ -1507,7 +1507,7 @@ CvANN_MLP::CvANN_MLP( const Mat& _layer_sizes, int _activ_func,
layer_sizes = wbuf = 0;
min_val = max_val = min_val1 = max_val1 = 0.;
weights = 0;
rng = cvRNG(-1);
rng = &cv::theRNG();
default_model_name = "my_nn";
create( _layer_sizes, _activ_func, _f_param1, _f_param2 );
}