p61743098
/
sagecal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update manifold average without randomization

This commit is contained in:
Sarod Yatawatta 2018-02-06 21:27:25 +01:00
parent a96d481b8b
commit 59475a7591
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/Dirac/Dirac.h
View File

@ -1177,10 +1177,11 @@ random_permutation(int n, int weighted_iter, double *w);
M: no of directions
Nf: no of frequencies
Niter: everaging iterations
randomize: if >0, use random starting point
Nt: threads
*/
extern int
calculate_manifold_average(int N,int M,int Nf,double *Y,int Niter,int Nt);
calculate_manifold_average(int N,int M,int Nf,double *Y,int Niter,int randomize,int Nt);
/* find U to minimize

11
src/lib/Dirac/manifold_average.c
View File

@ -29,6 +29,7 @@ typedef struct thread_data_manavg_ {
int N;
int M;
int Nf;
int randomize;
} thread_data_manavg_t;
/* worker thread function for manifold average+projection */
@ -94,7 +95,12 @@ manifold_average_threadfn(void *data) {
}
/* first averaging, select random block in [0,Nf-1] to project to */
int cr=rand()%(t->Nf); /* remainder always in [0,Nf-1] */
int cr; /* remainder always in [0,Nf-1] */
if (t->randomize) {
cr=rand()%(t->Nf); /* remainder always in [0,Nf-1] */
} else {
cr=0;
}
/* J3 <= cr th block */
my_ccopy(t->N*4,&Yc[cr*t->N*4],1,J3,1);
/* project the remainder */
@ -194,7 +200,7 @@ manifold_average_threadfn(void *data) {
}
int
calculate_manifold_average(int N,int M,int Nf,double *Y,int Niter,int Nt) {
calculate_manifold_average(int N,int M,int Nf,double *Y,int Niter,int randomize,int Nt) {
/* Y : each 2Nx2xM blocks belong to one freq,
select one 2Nx2 from this, reorder to J format : Nf blocks
and average */
@ -233,6 +239,7 @@ calculate_manifold_average(int N,int M,int Nf,double *Y,int Niter,int Nt) {
threaddata[nth].Niter=Niter;
threaddata[nth].startM=ci;
threaddata[nth].endM=ci+Nthb-1;
threaddata[nth].randomize=randomize;
pthread_create(&th_array[nth],&attr,manifold_average_threadfn,(void*)(&threaddata[nth]));
ci=ci+Nthb;