Skip to content

Commit

Permalink
Merge pull request #5 from dialoguetoolkit/development
Browse files Browse the repository at this point in the history
Customizable Referential Task does lists of stimuli sets
  • Loading branch information
dialoguetoolkit authored Nov 30, 2021
2 parents 928d6d2 + af4bea0 commit 24cc299
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
rorschachlongersequence.txt
rorschachlongersequence.txt
rorschachlongersequence.txt
rorschachlongersequence.txt
rorschachshortsequence.txt
testsequence1.txt
testsequence2.txt
testsequence3.txt
testsequence4.txt
Original file line number Diff line number Diff line change
@@ -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
r21.png ¦r21.png ¦B¦S,D¦S
r22.png ¦r23.png ¦B¦S,D¦D
5 changes: 5 additions & 0 deletions experimentresources/stimuli/rorschachset01/testsequence2.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions experimentresources/stimuli/rorschachset01/testsequence3.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions experimentresources/stimuli/rorschachset01/testsequence4.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 24cc299

Please sign in to comment.