Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
-------------------------------------
meldata.h
-------------------------------------
53,55d112
<
< inline Matrix& get_pcaEVN() {return pcaEVN;}
< inline void set_pcaEVN(Matrix& Arg) {pcaEVN = Arg;}
59,61c116,118
<
< inline DiagonalMatrix& get_pcaDVN() {return pcaDVN;}
< inline void set_pcaDVN(DiagonalMatrix& Arg) {pcaDVN = Arg;}
---
>
> inline Matrix& get_data() {return Data;}
> inline void set_data(Matrix& Arg) {Data = Arg;}
96,100c153,154
< // inline Matrix& get_DataVN() {
< // Matrix tmp;
< // tmp = SP(Data,ones(Data.Nrows(),1)*stdDevi);
< // return tmp;
< // }
---
> inline Matrix& get_DataVN() {return DataVN;}
> inline void set_DataVN(Matrix& Arg) {DataVN = Arg;}
123,131d176
< inline void calc_Corr() { Corr = cov(Data.t());}
< inline void calc_CorrVN() {
< CorrVN = cov(SP(Data,ones(Data.Nrows(),1)*stdDevi).t());
< }
<
< inline SymmetricMatrix& get_Corr() {return Corr;}
< inline SymmetricMatrix& get_CorrVN() {return CorrVN;}
<
<
157,162d201
< Matrix pcaEVN;
< DiagonalMatrix pcaDVN;
<
< SymmetricMatrix Corr;
< SymmetricMatrix CorrVN;
<
178a218
> Matrix DataVN;
-------------------------------------
meldata.cc
-------------------------------------
103d162
<
107,108c166,167
< //Corr = cov(Data.t());
< calc_Corr();
---
> SymmetricMatrix Corr;
> Corr = cov(Data.t());
128c187
<
---
>
132,145c191,192
<
< if(opts.segment.value().length()>0){
< Matrix Res;
< Res = ones(Data.Nrows(),1)*RXweight;
< if(opts.varnorm.value()){
< Res = SP(SP(Data,ones(Data.Nrows(),1)*stdDevi),Res);
< }
< else
< Res = SP(Data,Res);
< Data = Res;
< }
<
< calc_CorrVN();
<
---
>
> DataVN = SP(Data,ones(Data.Nrows(),1)*stdDevi);
147,148c194
< Data = SP(Data,ones(Data.Nrows(),1)*stdDevi);
< Corr = CorrVN;
---
> Data = DataVN;
151,153d196
< else
< calc_Corr();
<
-------------------------------------
melodic.cc
-------------------------------------
92c152
< pcaobj.perf_pca(melodat.get_Data());
---
> pcaobj.perf_pca(melodat.get_DataVN());
-------------------------------------
melpca.cc
-------------------------------------
30a91,92
> SymmetricMatrix Corr;
>
34,38c96,99
< if(opts.varnorm.value()){
< Res = SP(SP(melodat.get_Data(),ones(melodat.get_Data().Nrows(),1)*melodat.get_stdDevi()),Res);
< }
< else
< Res = SP(melodat.get_Data(),Res);
---
> Res = SP(melodat.get_DataVN(),Res);
> melodat.set_DataVN(Res);
> Res = ones(Data.Nrows(),1)*melodat.get_RXweight();
> Res = SP(melodat.get_Data(),Res);
40,41d100
< melodat.calc_Corr();
< melodat.calc_CorrVN();
43a103,104
> Corr = cov(melodat.get_Data().t());
>
47c108
< EigenValues(melodat.get_Corr(),tmpD,tmpE);
---
> EigenValues(Corr,tmpD,tmpE);
170c231
< Corr = cov(SP(melodat.get_Data(),ones(melodat.get_Data().Nrows(),1)*melodat.get_stdDevi()).t());
---
> Corr = cov(melodat.get_DataVN().t());