Skip to content

Commit 92cd696

Browse files
MSendenMSenden
committed
corrected mean squares calculation in PEA
1 parent fcea88a commit 92cd696

File tree

3 files changed

+63
-23
lines changed

3 files changed

+63
-23
lines changed

‎Computational Neuroimaging Toolbox.mltbx

100755100644
70 Bytes
Binary file not shown.

‎Computational Neuroimaging Toolbox.prj

100755100644
Lines changed: 62 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,125 @@
11
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
2-
<configuration file="/home/donatello/Code/CNI_toolbox/Computational Neuroimaging Toolbox.prj" location="/home/donatello/Code/CNI_toolbox" name="Computational Neuroimaging Toolbox" target="target.toolbox" target-name="Package Toolbox">
2+
<configuration file="/home/donatello/Code/CNI_toolbox/code/Computational Neuroimaging Toolbox.prj" location="/home/donatello/Code/CNI_toolbox/code" name="Computational Neuroimaging Toolbox" target="target.toolbox" target-name="Package Toolbox">
33
<param.appname>Computational Neuroimaging Toolbox</param.appname>
44
<param.authnamewatermark>Mario Senden</param.authnamewatermark>
5-
<param.email>mario.senden@maastrichtuniversity.nl</param.email>
6-
<param.company>Maastricht University</param.company>
7-
<param.summary>A MATLAB toolbox for estimating input-referred models.</param.summary>
5+
<param.email>mario.senden@googlemail.com</param.email>
6+
<param.company />
7+
<param.summary>MATLAB toolbox for estimating input-referred models.</param.summary>
88
<param.description />
99
<param.screenshot />
10-
<param.version>1.0.1</param.version>
10+
<param.version>1.0</param.version>
1111
<param.output>${PROJECT_ROOT}/Computational Neuroimaging Toolbox.mltbx</param.output>
1212
<param.products.name />
1313
<param.products.id />
1414
<param.products.version />
1515
<param.platforms />
16-
<param.guid>7068eb66-9ff0-4bcf-ab6f-0de3ce7956cc</param.guid>
16+
<param.guid>686d0d1d-4342-46d2-87e5-3e06e298ef5a</param.guid>
1717
<param.exclude.filters />
18+
<param.exclude.pcodedmfiles>true</param.exclude.pcodedmfiles>
1819
<param.examples />
1920
<param.demosxml />
2021
<param.apps />
22+
<param.registered.apps />
2123
<param.docs />
24+
<param.getting.started.guide />
2225
<param.matlabpath.excludes />
2326
<param.javaclasspath.excludes />
27+
<param.exported.on.package>false</param.exported.on.package>
28+
<param.release.start>R2016a</param.release.start>
29+
<param.release.end>latest</param.release.end>
30+
<param.release.current.only>false</param.release.current.only>
31+
<param.compatiblity.windows>true</param.compatiblity.windows>
32+
<param.compatiblity.macos>true</param.compatiblity.macos>
33+
<param.compatiblity.linux>true</param.compatiblity.linux>
34+
<param.compatiblity.matlabonline>true</param.compatiblity.matlabonline>
35+
<param.installation.map />
36+
<param.additional.sw.names />
37+
<param.additional.sw.licenses />
38+
<param.additional.sw.win.url />
39+
<param.additional.sw.mac.url />
40+
<param.additional.sw.linux.url />
2441
<unset>
42+
<param.company />
2543
<param.description />
2644
<param.screenshot />
45+
<param.version />
2746
<param.output />
2847
<param.products.name />
2948
<param.products.id />
3049
<param.products.version />
3150
<param.platforms />
3251
<param.exclude.filters />
52+
<param.exclude.pcodedmfiles />
3353
<param.examples />
3454
<param.demosxml />
3555
<param.apps />
56+
<param.registered.apps />
3657
<param.docs />
58+
<param.getting.started.guide />
3759
<param.matlabpath.excludes />
3860
<param.javaclasspath.excludes />
61+
<param.exported.on.package />
62+
<param.release.current.only />
63+
<param.compatiblity.windows />
64+
<param.compatiblity.macos />
65+
<param.compatiblity.linux />
66+
<param.compatiblity.matlabonline />
67+
<param.installation.map />
68+
<param.additional.sw.names />
69+
<param.additional.sw.licenses />
70+
<param.additional.sw.win.url />
71+
<param.additional.sw.mac.url />
72+
<param.additional.sw.linux.url />
3973
</unset>
4074
<fileset.rootdir>
41-
<file>${PROJECT_ROOT}/code</file>
75+
<file>/home/donatello/Code/CNI_toolbox/code</file>
4276
</fileset.rootdir>
4377
<fileset.rootfiles>
44-
<file>${PROJECT_ROOT}/code/IRM.m</file>
45-
<file>${PROJECT_ROOT}/code/PEA.m</file>
46-
<file>${PROJECT_ROOT}/code/RRT.m</file>
47-
<file>${PROJECT_ROOT}/code/pRF.m</file>
78+
<file>${PROJECT_ROOT}/IRM.m</file>
79+
<file>${PROJECT_ROOT}/PEA.m</file>
80+
<file>${PROJECT_ROOT}/RRT.m</file>
81+
<file>${PROJECT_ROOT}/pRF.m</file>
4882
</fileset.rootfiles>
4983
<fileset.depfun.included />
5084
<fileset.depfun.excluded />
5185
<fileset.package />
5286
<build-deliverables>
53-
<file location="/home/donatello/Code/CNI_toolbox" name="Computational Neuroimaging Toolbox.mltbx" optional="false">/home/donatello/Code/CNI_toolbox/Computational Neuroimaging Toolbox.mltbx</file>
87+
<file location="/home/donatello/Code/CNI_toolbox/code" name="Computational Neuroimaging Toolbox.mltbx" optional="false">/home/donatello/Code/CNI_toolbox/code/Computational Neuroimaging Toolbox.mltbx</file>
5488
</build-deliverables>
5589
<workflow />
5690
<matlab>
57-
<root>/usr/local/MATLAB/R2017a</root>
91+
<root>/usr/local/MATLAB/R2018b</root>
5892
<toolboxes>
59-
<toolbox name="fixedpoint" />
6093
<toolbox name="matlabcoder" />
61-
<toolbox name="matlabhdlcoder" />
6294
<toolbox name="embeddedcoder" />
95+
<toolbox name="fixedpoint" />
96+
<toolbox name="matlabhdlcoder" />
97+
<toolbox name="neuralnetwork" />
6398
</toolboxes>
6499
<toolbox>
65-
<fixedpoint>
100+
<matlabcoder>
66101
<enabled>true</enabled>
67-
</fixedpoint>
102+
</matlabcoder>
68103
</toolbox>
69104
<toolbox>
70-
<matlabcoder>
105+
<embeddedcoder>
71106
<enabled>true</enabled>
72-
</matlabcoder>
107+
</embeddedcoder>
108+
</toolbox>
109+
<toolbox>
110+
<fixedpoint>
111+
<enabled>true</enabled>
112+
</fixedpoint>
73113
</toolbox>
74114
<toolbox>
75115
<matlabhdlcoder>
76116
<enabled>true</enabled>
77117
</matlabhdlcoder>
78118
</toolbox>
79119
<toolbox>
80-
<embeddedcoder>
120+
<neuralnetwork>
81121
<enabled>true</enabled>
82-
</embeddedcoder>
122+
</neuralnetwork>
83123
</toolbox>
84124
</matlab>
85125
<platform>
@@ -91,7 +131,7 @@
91131
<vista>false</vista>
92132
<linux>true</linux>
93133
<solaris>false</solaris>
94-
<osver>4.13.0-45-generic</osver>
134+
<osver>4.15.0-42-generic</osver>
95135
<os32>false</os32>
96136
<os64>true</os64>
97137
<arch>glnxa64</arch>

‎code/PEA.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function set_direction(self,direction)
182182
y = Xc * b;
183183
y_ = mean(y);
184184
MSM = (y-y_)'*(y-y_)/df1;
185-
MSE = (y-data(:,v))'*(y-Dc)/df2;
185+
MSE = (y-Dc)'*(y-Dc)/df2;
186186

187187
results.Phase(v) = angle(b(1)+b(2)*1i);
188188
results.Amplitude(v) = abs(b(1)+b(2)*1i);

0 commit comments

Comments
 (0)