Skip to content

Commit

Permalink
fixed minor bug in eval loop with default gesture
Browse files Browse the repository at this point in the history
  • Loading branch information
ztjona committed Jun 10, 2022
1 parent b70dfc0 commit 98448ec
Show file tree
Hide file tree
Showing 81 changed files with 245 additions and 19 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# List of untracked files to ignore
*.asv
resultsHGR/
resources/
example_evalATrainingSet/resultsHGR/
*.mltbx
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ Check the following examples to better understand the capabilities of the toolbo
* **doc/showConfusion.m** how to plot

Advanced exampes:
* doc/example_evalATrainingSet/evaluatingATrainingSet
* doc/example_evalATrainingSet/evaluatingATrainingSet

# Changelog
## Version 2.5.3
* Fixed bug regarding default gesture in eval recognition loop for dataset G11.
33 changes: 26 additions & 7 deletions ToolboxPackagingConfiguration.prj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
<configuration build-checksum="1585905035" file="C:\Users\z_tja\OneDrive - Escuela Politécnica Nacional\PROYECTO\EMG\CEPRA\dataset\proyects\eval_HGRresponses\ToolboxPackagingConfiguration.prj" location="C:\Users\z_tja\OneDrive - Escuela Politécnica Nacional\PROYECTO\EMG\CEPRA\dataset\proyects\eval_HGRresponses" name="ToolboxPackagingConfiguration" target="target.toolbox" target-name="Package Toolbox">
<configuration build-checksum="3356902378" file="C:\Users\z_tja\OneDrive - Escuela Politécnica Nacional\PROYECTO\EMG\CEPRA\dataset\proyects\eval_HGRresponses\ToolboxPackagingConfiguration.prj" location="C:\Users\z_tja\OneDrive - Escuela Politécnica Nacional\PROYECTO\EMG\CEPRA\dataset\proyects\eval_HGRresponses" name="ToolboxPackagingConfiguration" target="target.toolbox" target-name="Package Toolbox">
<param.appname>eval_HGRresponses</param.appname>
<param.authnamewatermark>Jonathan A. Zea</param.authnamewatermark>
<param.email>[email protected]</param.email>
Expand All @@ -9,8 +9,8 @@
Load EMG signals (view example_loadEMG).
Evaluates a repetition (view example_evalARepetition).
Evaluate submissions over training user group and testing user group, generate results, graphs and tex (view example_evalATrainingSet).</param.description>
<param.screenshot />
<param.version>2.5</param.version>
<param.screenshot>${PROJECT_ROOT}\toolboxImg.png</param.screenshot>
<param.version>2.5.3</param.version>
<param.output>${PROJECT_ROOT}\eval_HGRresponses.mltbx</param.output>
<param.products.name />
<param.products.id />
Expand Down Expand Up @@ -70,7 +70,28 @@ resultsHGR/responseExp4S_x8/summary.txt
resultsHGR/responseExp4S_x8/tiempos.fig
resultsHGR/responseExp4S_x8/tiempos.png</param.exclude.filters>
<param.exclude.pcodedmfiles>true</param.exclude.pcodedmfiles>
<param.examples />
<param.examples>&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;examples&gt;
&lt;exampleCategory name="doc"&gt;
&lt;example name="example_dataset11Gestures" type="html"&gt;
&lt;file type="source"&gt;/doc/html/example_dataset11Gestures.html&lt;/file&gt;
&lt;file type="main"&gt;/doc/example_dataset11Gestures.m&lt;/file&gt;
&lt;file type="thumbnail"&gt;/doc/html/example_dataset11Gestures.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_dataset11Gestures_01.png&lt;/file&gt;
&lt;/example&gt;
&lt;example name="example_showConfusion" type="html"&gt;
&lt;file type="source"&gt;/doc/html/example_showConfusion.html&lt;/file&gt;
&lt;file type="main"&gt;/doc/example_showConfusion.m&lt;/file&gt;
&lt;file type="thumbnail"&gt;/doc/html/example_showConfusion.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_01.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_02.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_03.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_04.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_05.png&lt;/file&gt;
&lt;file type="image"&gt;/doc/html/example_showConfusion_06.png&lt;/file&gt;
&lt;/example&gt;
&lt;/exampleCategory&gt;
&lt;/examples&gt;</param.examples>
<param.demosxml />
<param.apps />
<param.registered.apps />
Expand All @@ -97,14 +118,12 @@ resultsHGR/responseExp4S_x8/tiempos.png</param.exclude.filters>
<param.additional.sw.linux.url />
<unset>
<param.company />
<param.screenshot />
<param.output />
<param.products.name />
<param.products.id />
<param.products.version />
<param.platforms />
<param.exclude.pcodedmfiles />
<param.examples />
<param.demosxml />
<param.apps />
<param.registered.apps />
Expand All @@ -131,13 +150,13 @@ resultsHGR/responseExp4S_x8/tiempos.png</param.exclude.filters>
<fileset.rootfiles>
<file>${PROJECT_ROOT}\.git</file>
<file>${PROJECT_ROOT}\.gitignore</file>
<file>${PROJECT_ROOT}\a.txt</file>
<file>${PROJECT_ROOT}\data</file>
<file>${PROJECT_ROOT}\demos.xml</file>
<file>${PROJECT_ROOT}\doc</file>
<file>${PROJECT_ROOT}\eval_HGR_set.m</file>
<file>${PROJECT_ROOT}\info.xml</file>
<file>${PROJECT_ROOT}\README.md</file>
<file>${PROJECT_ROOT}\resources</file>
<file>${PROJECT_ROOT}\srcs</file>
<file>${PROJECT_ROOT}\toolboxImg.png</file>
</fileset.rootfiles>
Expand Down
14 changes: 10 additions & 4 deletions demos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ Load EMG signals (view example_loadEMG).
Evaluates a repetition (view example_evalARepetition).
Evaluate submissions over training user group and testing user group, generate results, graphs and tex (view example_evalATrainingSet).</description>
<demosection>
<label>example_evalATrainingSet</label>
<label>doc</label>
<demoitem>
<label>evaluatingATrainingSet</label>
<label>example_dataset11Gestures</label>
<type>other</type>
<source>evaluatingATrainingSet</source>
<file>doc/example_evalATrainingSet/html/evaluatingATrainingSet.html</file>
<source>example_dataset11Gestures</source>
<file>doc/html/example_dataset11Gestures.html</file>
</demoitem>
<demoitem>
<label>example_showConfusion</label>
<type>other</type>
<source>example_showConfusion</source>
<file>doc/html/example_showConfusion.html</file>
</demoitem>
</demosection>
</demos>
2 changes: 1 addition & 1 deletion doc/html/example_dataset11Gestures.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!--
This HTML was auto-generated from MATLAB code.
To make changes, update the MATLAB code and republish this document.
--><title>example_dataset11Gestures</title><meta name="generator" content="MATLAB 9.11"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2022-05-18"><meta name="DC.source" content="example_dataset11Gestures.m"><style type="text/css">
--><title>example_dataset11Gestures</title><meta name="generator" content="MATLAB 9.11"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2022-06-10"><meta name="DC.source" content="example_dataset11Gestures.m"><style type="text/css">
html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outine:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}

html { min-height:100%; margin-bottom:1px; }
Expand Down
Binary file modified doc/html/example_dataset11Gestures.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_dataset11Gestures_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions doc/html/example_showConfusion.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!--
This HTML was auto-generated from MATLAB code.
To make changes, update the MATLAB code and republish this document.
--><title>example_showConfusion</title><meta name="generator" content="MATLAB 9.11"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2022-05-18"><meta name="DC.source" content="example_showConfusion.m"><style type="text/css">
--><title>example_showConfusion</title><meta name="generator" content="MATLAB 9.11"><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"><meta name="DC.date" content="2022-06-10"><meta name="DC.source" content="example_showConfusion.m"><style type="text/css">
html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outine:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}

html { min-height:100%; margin-bottom:1px; }
Expand Down Expand Up @@ -176,8 +176,8 @@
repInfo4];
</pre><h2 id="4">Running the evalRecognition Loop</h2><pre class="codeinput">[evaluation, confusion, tiemps] = evalRecognition_loop(responses, <span class="keyword">...</span>
repsInfo, userGroup, repGroup, evalOpts);
</pre><pre class="codeoutput">18-May-2022 12:45:04: Analyzing user_1
18-May-2022 12:45:04: Analyzing user_2
</pre><pre class="codeoutput">10-Jun-2022 17:26:54: Analyzing user_1
10-Jun-2022 17:26:54: Analyzing user_2
</pre><h2 id="5">Analyse results</h2><pre class="codeinput">[sumTable, class, classStd, recog, recogStd, time, timeStd, <span class="keyword">...</span>
targets, outputs] = <span class="keyword">...</span>
analyseResults(evaluation, confusion, tiemps, options); <span class="comment">% dataPersons</span>
Expand All @@ -191,7 +191,7 @@
===========================================
MAIN RESULTS
===========================================
18-May-2022 12:45:05
10-Jun-2022 17:26:55
classification Accuracy: 75.00% &plusmn; 35.36% recognition Accuracy: 50.00% &plusmn; 35.36%
time: 0.1 &plusmn; 4.21637e-17 [s]

Expand Down
Binary file modified doc/html/example_showConfusion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/example_showConfusion_06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion eval_HGR_set.m
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
% by user, by rep, etc.
resultsFile = [options.evalResultsFolder '\' experimentName '.mat'];
[evaluation, confusion, tiemps] = evalRecognition_loop(responses, ...
privInfo, userGroup, repGroup);
privInfo, userGroup, repGroup, options);

fecha = datestr(datetime);
save(resultsFile, 'evaluation', 'confusion', 'tiemps', 'fecha')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info description="This toolbox evaluates the responses of a Hand Gesture Recognition model for both a unique repetition, or a full set of repetitions and users.&#xa;Load EMG signals (view example_loadEMG).&#xa;Evaluates a repetition (view example_evalARepetition).&#xa;Evaluate submissions over training user group and testing user group, generate results, graphs and tex (view example_evalATrainingSet)." />
2 changes: 2 additions & 0 deletions resources/project/Project.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info MetadataType="distributed" />
2 changes: 2 additions & 0 deletions resources/project/ProjectData.type.Info.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info Name="Hand Gesture Recognition (emg based) Toolbox" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="1" SingleValued="1" DataType="None" Name="Classification" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Artifact" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Convenience" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Derived" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Design" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="None" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Other" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info ReadOnly="READ_ONLY" Name="Test" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info Name="examples" />
2 changes: 2 additions & 0 deletions resources/project/Root.type.Files/.gitignore.type.File.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
2 changes: 2 additions & 0 deletions resources/project/Root.type.Files/data.type.File.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
2 changes: 2 additions & 0 deletions resources/project/Root.type.Files/doc.type.File.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="derived" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
2 changes: 2 additions & 0 deletions resources/project/Root.type.Files/srcs.type.File.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Loading

0 comments on commit 98448ec

Please sign in to comment.