diff --git a/experimentresources/stimuli/rorschachset01/multiplesetlist.txt b/experimentresources/stimuli/rorschachset01/multiplesetlist.txt index 2414199..5dff279 100644 --- a/experimentresources/stimuli/rorschachset01/multiplesetlist.txt +++ b/experimentresources/stimuli/rorschachset01/multiplesetlist.txt @@ -1,5 +1,4 @@ -rorschachlongersequence.txt -rorschachlongersequence.txt -rorschachlongersequence.txt -rorschachlongersequence.txt -rorschachshortsequence.txt \ No newline at end of file +testsequence1.txt +testsequence2.txt +testsequence3.txt +testsequence4.txt \ No newline at end of file diff --git a/experimentresources/stimuli/rorschachset01/rorschachshortsequence.txt b/experimentresources/stimuli/rorschachset01/testsequence1.txt similarity index 68% rename from experimentresources/stimuli/rorschachset01/rorschachshortsequence.txt rename to experimentresources/stimuli/rorschachset01/testsequence1.txt index ee90c54..9978f9d 100644 --- a/experimentresources/stimuli/rorschachset01/rorschachshortsequence.txt +++ b/experimentresources/stimuli/rorschachset01/testsequence1.txt @@ -1,4 +1,5 @@ P1 IMAGE¦P2 IMAGE¦MATCHER, 1=P1, 2=P2, B=BOTH ¦BUTTONS DISPLAYED ¦CORRECT ANSWER r04.png ¦r04.png ¦B¦S,D¦S r15.png ¦r15.png ¦B¦S,D¦S -r21.png ¦r21.png ¦B¦S,D¦S \ No newline at end of file +r21.png ¦r21.png ¦B¦S,D¦S +r22.png ¦r23.png ¦B¦S,D¦D \ No newline at end of file diff --git a/experimentresources/stimuli/rorschachset01/testsequence2.txt b/experimentresources/stimuli/rorschachset01/testsequence2.txt new file mode 100644 index 0000000..b96c543 --- /dev/null +++ b/experimentresources/stimuli/rorschachset01/testsequence2.txt @@ -0,0 +1,5 @@ +P1 IMAGE¦P2 IMAGE¦MATCHER, 1=P1, 2=P2, B=BOTH ¦BUTTONS DISPLAYED ¦CORRECT ANSWER +r04.png ¦r04.png ¦B¦S,D¦S +r19.png ¦r10.png ¦B¦S,D¦D +r20.png ¦r22.png ¦B¦S,D¦D +r22.png ¦r23.png ¦B¦S,D¦D \ No newline at end of file diff --git a/experimentresources/stimuli/rorschachset01/testsequence3.txt b/experimentresources/stimuli/rorschachset01/testsequence3.txt new file mode 100644 index 0000000..2ed4c13 --- /dev/null +++ b/experimentresources/stimuli/rorschachset01/testsequence3.txt @@ -0,0 +1,5 @@ +P1 IMAGE¦P2 IMAGE¦MATCHER, 1=P1, 2=P2, B=BOTH ¦BUTTONS DISPLAYED ¦CORRECT ANSWER +r04.png ¦r04.png ¦B¦S,D¦S +r11.png ¦r12.png ¦B¦S,D¦D +r24.png ¦r24.png ¦B¦S,D¦S +r22.png ¦r23.png ¦B¦S,D¦D \ No newline at end of file diff --git a/experimentresources/stimuli/rorschachset01/testsequence4.txt b/experimentresources/stimuli/rorschachset01/testsequence4.txt new file mode 100644 index 0000000..47c2452 --- /dev/null +++ b/experimentresources/stimuli/rorschachset01/testsequence4.txt @@ -0,0 +1,5 @@ +P1 IMAGE¦P2 IMAGE¦MATCHER, 1=P1, 2=P2, B=BOTH ¦BUTTONS DISPLAYED ¦CORRECT ANSWER +r04.png ¦r04.png ¦B¦S,D¦S +r25.png ¦r26.png ¦B¦S,D¦D +r24.png ¦r25.png ¦B¦S,D¦D +r22.png ¦r23.png ¦B¦S,D¦D \ No newline at end of file diff --git a/src/main/java/diet/server/ConversationController/Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start.java b/src/main/java/diet/server/ConversationController/Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start.java index 810abff..e61e258 100644 --- a/src/main/java/diet/server/ConversationController/Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start.java +++ b/src/main/java/diet/server/ConversationController/Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start.java @@ -25,7 +25,7 @@ public class Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start extend CustomizableReferentialTaskSettingsFactory crtsf = new CustomizableReferentialTaskSettingsFactory(this, true); - CustomizableReferentialTaskSettings crts = crtsf.getNextCustomizableReferentialTaskSettings(); + //CustomizableReferentialTaskSettings crts = crtsf.getNextCustomizableReferentialTaskSettings(); //CustomizableReferentialTask crt = new CustomizableReferentialTask(this, crts); // CustomizableReferentialTask crt = new CustomizableReferentialTask(this, 5000,true); // Participant pDirector; @@ -52,7 +52,7 @@ public Telegram_Dyadic_Customizable_ReferentialTask_Automatic_Start(Conversation public void startParticipants(TelegramParticipant tp1, TelegramParticipant tp2){ pp.createNewSubdialogue(tp1,tp2); - CustomizableReferentialTask crt = new CustomizableReferentialTask(this, crts); + CustomizableReferentialTask crt = new CustomizableReferentialTask(this, crtsf.getNextCustomizableReferentialTaskSettings()); c.telegram_sendInstructionToParticipant_MonospaceFont(tp1, "Please start!"); c.telegram_sendInstructionToParticipant_MonospaceFont(tp2, "Please start!"); crt.startTask(tp1, tp2); diff --git a/src/main/java/diet/task/CustomizableReferentialTask/CustomizableReferentialTaskSettingsFactory.java b/src/main/java/diet/task/CustomizableReferentialTask/CustomizableReferentialTaskSettingsFactory.java index 37280a5..c80bb19 100644 --- a/src/main/java/diet/task/CustomizableReferentialTask/CustomizableReferentialTaskSettingsFactory.java +++ b/src/main/java/diet/task/CustomizableReferentialTask/CustomizableReferentialTaskSettingsFactory.java @@ -268,7 +268,7 @@ public CustomizableReferentialTaskSettings getNextCustomizableReferentialTaskSet } CustomizableReferentialTaskSettings crts = this.vcrts.elementAt(indexOfNextFree); - Conversation.printWSln("Main", "Returning stimuli set "+crts.filename); + Conversation.printWSln("Main", "Using stimuli set "+crts.filename); indexOfNextFree++; return crts; }