Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
melodic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
melodic
Commits
86605ef7
Commit
86605ef7
authored
20 years ago
by
Stephen Smith
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
57522b61
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
out.txt
+0
-135
0 additions, 135 deletions
out.txt
test.cc
+6
-0
6 additions, 0 deletions
test.cc
with
6 additions
and
135 deletions
out.txt
deleted
100644 → 0
+
0
−
135
View file @
57522b61
-------------------------------------
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());
This diff is collapsed.
Click to expand it.
test.cc
+
6
−
0
View file @
86605ef7
/* test.cc
Copyright (C) 1999-2004 University of Oxford */
/* CCOPYRIGHT */
#include
<iostream.h>
#include
<iomanip>
#include
"libvis/miscplot.h"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment