Skip to content

Commit

Permalink
Create new stimuli for the training part of the experiments
Browse files Browse the repository at this point in the history
  • Loading branch information
remi-blandin committed Nov 18, 2021
1 parent 1a837c9 commit f17ba82
Show file tree
Hide file tree
Showing 35 changed files with 8,959 additions and 735 deletions.
Binary file modified doc/presentation_methods.odp
Binary file not shown.
1,453 changes: 737 additions & 716 deletions speaker-files/male.speaker

Large diffs are not rendered by default.

Binary file modified stimuli/dev/f_a_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/f_a_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/f_e_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/f_e_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/f_i_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/f_i_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/f_o_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/f_o_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/f_u_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/f_u_MM_bwe_pressed.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_1d_modal.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_1d_pressed.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_MM_modal.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_MM_pressed.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_bwe_modal.wav
Binary file not shown.
Binary file added stimuli/dev/m_Y_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/m_a_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/m_a_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/m_e_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/m_e_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/m_i_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/m_i_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/m_o_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/m_o_MM_bwe_pressed.wav
Binary file not shown.
Binary file modified stimuli/dev/m_u_MM_bwe_modal.wav
Binary file not shown.
Binary file modified stimuli/dev/m_u_MM_bwe_pressed.wav
Binary file not shown.
6 changes: 6 additions & 0 deletions stimuli/dev/stimuli.m3u
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ f_u_MM_1d_modal.wav
f_u_MM_MM_pressed.wav
f_u_MM_bwe_pressed.wav
f_u_MM_1d_pressed.wav
m_Y_MM_MM_modal.wav
m_Y_MM_bwe_modal.wav
m_Y_MM_1d_modal.wav
m_Y_MM_MM_pressed.wav
m_Y_MM_bwe_pressed.wav
m_Y_MM_1d_pressed.wav
m_a_MM_MM_modal.wav
m_a_MM_bwe_modal.wav
m_a_MM_1d_modal.wav
Expand Down
14 changes: 7 additions & 7 deletions stimuli/naturalness_evaluation_interface.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
hs = inputdlg (prompt, "Entrer le numero du participant", rowscols) ;
subject = str2num(hs{1});
if exist(sprintf("participant_%d.csv", subject),'file')!=0
warndlg(sprintf("Le fichier <participant\\_%d.csv> existe déjà .", subject));
warndlg(sprintf("Le fichier <participant\\_%d.csv> existe d�j��.", subject));
end


Expand All @@ -44,7 +44,7 @@
"dirStimuli", "dev/",
"files", {{ "f_a_MM_MM_modal.wav", ...
"m_a_MM_MM_modal.wav", ...
"m_u_MM_bwe_pressed.wav", "m_o_MM_MM_modal.wav",... # training stimuli
"m_Y_MM_bwe_pressed.wav", "m_Y_MM_MM_modal.wav",... # training stimuli
}}, ...
"sndNames", ...
{{"f_a_MM", "m_a_MM", "m_u_MM", "m_o_MM"}}, ...
Expand Down Expand Up @@ -74,7 +74,7 @@
end
end
strCreateDataStruct = [strCreateDataStruct ...
"""m_a_MM_MM_modal.wav"", ""f_a_MM_1d_modal.wav""}}, "...
"""m_Y_MM_bwe_pressed.wav"", ""m_Y_MM_1d_modal.wav""}}, "...
"""sndNames"", {{" strSndNames """m_a_MM_modal"", ""f_a_1d_modal""}}," ...
"""nStimuli"", " num2str(2*nStimuli) ", ""stimuliTested"", 1, ""stimuli"","...
"[1:nStimuli 1:nStimuli], ""testData"", zeros(2*nStimuli,5)," ...
Expand Down Expand Up @@ -164,7 +164,7 @@ function nextTraining(hObject, eventdata)
dataStruct = guidata(hObject);
if dataStruct.testData(dataStruct.stimuliTested, 3) == 0

errordlg (sprintf("Veuillez cliquer sur le bouton [Son] pour écouter le son."));
errordlg (sprintf("Veuillez cliquer sur le bouton [Son] pour �couter le son."));

elseif dataStruct.testData(dataStruct.stimuliTested, 2) == -1

Expand Down Expand Up @@ -213,7 +213,7 @@ function next(hObject, eventdata)
dataStruct = guidata(hObject);
if dataStruct.testData(dataStruct.stimuliTested, 3) == 0

errordlg (sprintf("Veuillez cliquer sur le bouton [Son] pour écouter le son."));
errordlg (sprintf("Veuillez cliquer sur le bouton [Son] pour �couter le son."));

elseif dataStruct.testData(dataStruct.stimuliTested, 2) == -1

Expand Down Expand Up @@ -270,8 +270,8 @@ function next(hObject, eventdata)
set(dataStruct.hSon,"visible", "off");
set(dataStruct.textTotallyNatural,"visible", "off");
set(dataStruct.graduations, "visible", "off");
set(dataStruct.textNumPair, "string", "Terminé!");
set(dataStruct.textNotNatural,"string","Données enregistrées",...
set(dataStruct.textNumPair, "string", "Termin�!");
set(dataStruct.textNotNatural,"string","Donn�es enregistr�es",...
"units", "normalized","position",[0.3 0.5 0.4 0.1]);

#################################
Expand Down
18 changes: 9 additions & 9 deletions stimuli/pair_comparison_interface.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
subject = str2num(hs{1});
if exist(sprintf("participant_%d.csv", subject),'file')!=0

warndlg(sprintf("Le fichier <participant\\_%d.csv> existe déjà.", subject));
warndlg(sprintf("Le fichier <participant\\_%d.csv> existe d�j�.", subject));

end
## test data
Expand Down Expand Up @@ -49,9 +49,9 @@
{{"f_a_MM_MM_modal.wav", "f_e_MM_MM_modal.wav",...
"f_a_MM_1d_modal.wav", "f_e_MM_1d_modal.wav",...
"f_a_MM_bwe_modal.wav", "f_e_MM_bwe_modal.wav",...
"m_a_MM_bwe_modal.wav",... # training stimuli
"m_a_MM_1d_modal.wav",... # training stimuli
"m_a_MM_MM_modal.wav",... # training stimuli
"m_Y_MM_bwe_modal.wav",... # training stimuli
"m_Y_MM_1d_modal.wav",... # training stimuli
"m_Y_MM_MM_modal.wav",... # training stimuli
}}, ...
"sndNames", ...
{{"f_a_MM", "f_e_MM",...
Expand Down Expand Up @@ -85,7 +85,7 @@
endfor
endfor
strCreateDataStruct = [strCreateDataStruct ...
"""m_a_MM_bwe_modal.wav"", ""m_a_MM_1d_modal.wav"", ""m_a_MM_MM_modal.wav"""...
"""m_Y_MM_bwe_modal.wav"", ""m_Y_MM_1d_modal.wav"", ""m_Y_MM_MM_modal.wav"""...
"}},""sndNames"", {{"...
strSndNames(1:end-1) "}}, " ...
"""grpNames"", {{""MM-1D"", ""MM-BWE"", ""1D-BWE""}},"...
Expand Down Expand Up @@ -318,7 +318,7 @@ function nextPairTraining(hObject, eventdata)
if or(dataStruct.testData(dataStruct.pairTested, 5) == 0,
dataStruct.testData(dataStruct.pairTested, 6) == 0)

errordlg (sprintf("Veuillez cliquer sur les boutons \n[Son 1] et [Son 2] pour écouter les sons à  comparer."));
errordlg (sprintf("Veuillez cliquer sur les boutons \n[Son 1] et [Son 2] pour �couter les sons �� comparer."));

elseif dataStruct.testData(dataStruct.pairTested, 7) == -1

Expand Down Expand Up @@ -392,7 +392,7 @@ function nextPair (hObject, eventdata)
## check if the sounds have been listened
if or(dataStruct.testData(dataStruct.pairTested, 5) == 0,
dataStruct.testData(dataStruct.pairTested, 6) == 0)
errordlg (sprintf("Veuillez cliquer sur les boutons \n[Son 1] et [Son 2] pour écouter les sons à  comparer."));
errordlg (sprintf("Veuillez cliquer sur les boutons \n[Son 1] et [Son 2] pour �couter les sons �� comparer."));
## check if the previous pair have been rated
elseif dataStruct.testData(dataStruct.pairTested, 7) == -1
errordlg (sprintf("Veuillez cliquer sur les boutons \n[Le son 1 est le plus naturel] ou [Le son 2 est le plus naturel]."));
Expand Down Expand Up @@ -502,9 +502,9 @@ function nextPair (hObject, eventdata)

writeRawDataToCsv(hObject, eventdata);

set(dataStruct.textNumPair, "string", "Terminé!");
set(dataStruct.textNumPair, "string", "Termin�!");
#X = dataStruct.X; Y = dataStruct.Y;
set(dataStruct.textQuestion, "string", "Données enregistrées");
set(dataStruct.textQuestion, "string", "Donn�es enregistr�es");
set(dataStruct.hSon1, "visible", "off");
set(dataStruct.hSon2, "visible", "off");
set(dataStruct.hSon2MostNatural, "visible", "off");
Expand Down
Loading

0 comments on commit f17ba82

Please sign in to comment.