Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@dialoguetoolkit
dialoguetoolkit committed May 28, 2021
1 parent 8a23da5 commit 847e911
Show file tree
Hide file tree
Showing 40 changed files with 14,873 additions and 190 deletions.
Binary file removed experimentresources/interventionsauto/9336C500
View file
Binary file not shown.
Binary file removed experimentresources/interventionsauto/F035C500
View file
Binary file not shown.
Binary file modified experimentresources/interventionsauto/emptytemplate.xlsx
View file
Binary file not shown.
Binary file modified experimentresources/interventionsauto/makehappier.xlsx
View file
Binary file not shown.
Binary file added experimentresources/interventionsauto/ok-regex.xlsx
View file
Binary file not shown.
105 changes: 105 additions & 0 deletions experimentresources/stimuli/rorschachset01/rohrschachlongersequence.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
P1 IMAGE ¦P2 IMAGE ¦MATCHER, 1=P1, 2=P2, B=BOTH ¦BUTTONS DISPLAYED ¦CORRECT ANSWER
r01.png ¦r01.png ¦B ¦S,D ¦S
r02.png ¦r07.png ¦B ¦S,D ¦D
r03.png ¦r08.png ¦B ¦S,D ¦D
r04.png ¦r04.png ¦B ¦S,D ¦S
r05.png ¦r05.png ¦B ¦S,D ¦S
r06.png ¦r09.png ¦B ¦S,D ¦D
r07.png ¦r09.png ¦B ¦S,D ¦D
r08.png ¦r08.png ¦B ¦S,D ¦S
r09.png ¦r09.png ¦B ¦S,D ¦D
r10.png ¦r10.png ¦B ¦S,D ¦S
r11.png ¦r11.png ¦B ¦S,D ¦D
r12.png ¦r01.png ¦B ¦S,D ¦D
r13.png ¦r04.png ¦B ¦S,D ¦D
r14.png ¦r14.png ¦B ¦S,D ¦S
r15.png ¦r09.png ¦B ¦S,D ¦D
r16.png ¦r16.png ¦B ¦S,D ¦S
r17.png ¦r09.png ¦B ¦S,D ¦D
r18.png ¦r18.png ¦B ¦S,D ¦S
r19.png ¦r19.png ¦B ¦S,D ¦S
r20.png ¦r20.png ¦B ¦S,D ¦S
r21.png ¦r09.png ¦B ¦S,D ¦D
r22.png ¦r22.png ¦B ¦S,D ¦S
r23.png ¦r09.png ¦B ¦S,D ¦D
r24.png ¦r24.png ¦B ¦S,D ¦S
r25.png ¦r25.png ¦B ¦S,D ¦S
r26.png ¦r21.png ¦B ¦S,D ¦D
r02.png ¦r02.png ¦B ¦S,D ¦S
r02.png ¦r05.png ¦B ¦S,D ¦D
r03.png ¦r06.png ¦B ¦S,D ¦D
r05.png ¦r05.png ¦B ¦S,D ¦S
r06.png ¦r06.png ¦B ¦S,D ¦S
r06.png ¦r11.png ¦B ¦S,D ¦D
r07.png ¦r15.png ¦B ¦S,D ¦D
r03.png ¦r03.png ¦B ¦S,D ¦S
r04.png ¦r04.png ¦B ¦S,D ¦D
r05.png ¦r15.png ¦B ¦S,D ¦S
r11.png ¦r13.png ¦B ¦S,D ¦D
r12.png ¦r03.png ¦B ¦S,D ¦D
r13.png ¦r04.png ¦B ¦S,D ¦D
r16.png ¦r16.png ¦B ¦S,D ¦S
r13.png ¦r11.png ¦B ¦S,D ¦D
r19.png ¦r19.png ¦B ¦S,D ¦S
r19.png ¦r11.png ¦B ¦S,D ¦D
r19.png ¦r19.png ¦B ¦S,D ¦S
r21.png ¦r21.png ¦B ¦S,D ¦S
r22.png ¦r22.png ¦B ¦S,D ¦S
r21.png ¦r11.png ¦B ¦S,D ¦D
r24.png ¦r24.png ¦B ¦S,D ¦S
r23.png ¦r07.png ¦B ¦S,D ¦D
r21.png ¦r21.png ¦B ¦S,D ¦S
r23.png ¦r23.png ¦B ¦S,D ¦S
r26.png ¦r20.png ¦B ¦S,D ¦D
r01.png ¦r01.png ¦B ¦S,D ¦S
r02.png ¦r07.png ¦B ¦S,D ¦D
r03.png ¦r08.png ¦B ¦S,D ¦D
r04.png ¦r04.png ¦B ¦S,D ¦S
r05.png ¦r05.png ¦B ¦S,D ¦S
r06.png ¦r09.png ¦B ¦S,D ¦D
r07.png ¦r09.png ¦B ¦S,D ¦D
r08.png ¦r08.png ¦B ¦S,D ¦S
r09.png ¦r09.png ¦B ¦S,D ¦D
r10.png ¦r10.png ¦B ¦S,D ¦S
r11.png ¦r11.png ¦B ¦S,D ¦D
r12.png ¦r01.png ¦B ¦S,D ¦D
r13.png ¦r04.png ¦B ¦S,D ¦D
r14.png ¦r14.png ¦B ¦S,D ¦S
r15.png ¦r09.png ¦B ¦S,D ¦D
r16.png ¦r16.png ¦B ¦S,D ¦S
r17.png ¦r09.png ¦B ¦S,D ¦D
r18.png ¦r18.png ¦B ¦S,D ¦S
r19.png ¦r19.png ¦B ¦S,D ¦S
r20.png ¦r20.png ¦B ¦S,D ¦S
r21.png ¦r09.png ¦B ¦S,D ¦D
r22.png ¦r22.png ¦B ¦S,D ¦S
r23.png ¦r09.png ¦B ¦S,D ¦D
r24.png ¦r24.png ¦B ¦S,D ¦S
r25.png ¦r25.png ¦B ¦S,D ¦S
r26.png ¦r21.png ¦B ¦S,D ¦D
r02.png ¦r02.png ¦B ¦S,D ¦S
r02.png ¦r05.png ¦B ¦S,D ¦D
r03.png ¦r06.png ¦B ¦S,D ¦D
r05.png ¦r05.png ¦B ¦S,D ¦S
r06.png ¦r06.png ¦B ¦S,D ¦S
r06.png ¦r11.png ¦B ¦S,D ¦D
r07.png ¦r15.png ¦B ¦S,D ¦D
r03.png ¦r03.png ¦B ¦S,D ¦S
r04.png ¦r04.png ¦B ¦S,D ¦D
r05.png ¦r15.png ¦B ¦S,D ¦S
r11.png ¦r13.png ¦B ¦S,D ¦D
r12.png ¦r03.png ¦B ¦S,D ¦D
r13.png ¦r04.png ¦B ¦S,D ¦D
r16.png ¦r16.png ¦B ¦S,D ¦S
r13.png ¦r11.png ¦B ¦S,D ¦D
r19.png ¦r19.png ¦B ¦S,D ¦S
r19.png ¦r11.png ¦B ¦S,D ¦D
r19.png ¦r19.png ¦B ¦S,D ¦S
r21.png ¦r21.png ¦B ¦S,D ¦S
r22.png ¦r22.png ¦B ¦S,D ¦S
r21.png ¦r11.png ¦B ¦S,D ¦D
r24.png ¦r24.png ¦B ¦S,D ¦S
r23.png ¦r07.png ¦B ¦S,D ¦D
r21.png ¦r21.png ¦B ¦S,D ¦S
r23.png ¦r23.png ¦B ¦S,D ¦S
r26.png ¦r20.png ¦B ¦S,D ¦D
10 changes: 9 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,15 @@
</plugins>
<resources>
<resource>
<targetPath>mazegame</targetPath>
<targetPath>mazegame</targetPath>
<directory>experimentresources/mazegame</directory>
<includes>
<include>**/*.*</include>
<include>**/*.*</include>
</includes>
</resource>
<resource>
<targetPath></targetPath>
<directory>experimentresources/mazegame</directory>
<includes>
<include>**/*.*</include>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/diet/server/Configuration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Configuration(){

//Below are some debug parameters - they are not essential.
public int login_minimumlength_of_participantID = 4;
public int login_numberOfParticipants = 2;
public int login_numberOfParticipants = 12;
public boolean login_autologin = false;

public boolean debug_debugMESSAGEBLOCKAGE = false; //true;//false;//true;//true;//false;//true;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/diet/server/Conversation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,10 @@ public void saveAdditionalRowOfDataToSpreadsheetOfTurns(String datatype, Partic
public void saveAdditionalRowOfDataToSpreadsheetOfTurns(String datatype, Participant p, String value, Vector additionalAttribVals){
try{
if (value==null)value="";
String subDialogueID = cC.pp.getSubdialogueID(p);
String subDialogueID = "notset";
if(p!=null) subDialogueID = cC.pp.getSubdialogueID(p);


long currentTIME = new Date().getTime();
long timeOfSendOnClient = currentTIME;
long timeOfRELAYONSERVER = currentTIME;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/diet/server/ConversationController/DefaultConversationController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import diet.server.IsTypingController.IsTypingOrNotTyping;
import diet.server.Configuration;
import diet.server.io.IntelligentIO;
import diet.task.DefaultTaskController;
import diet.task.TaskControllerInterface;
import diet.textmanipulationmodules.CyclicRandomTextGenerators.CyclicRandomParticipantIDGeneratorGROOP;
import diet.tg.TelegramMessageFromClient;
Expand Down Expand Up @@ -470,7 +471,7 @@ public String getID(){
}


public void performActionCalledByTaskController(String s){
public void performActionCalledByTaskController(String s, DefaultTaskController tc){

}

Expand Down
2 changes: 1 addition & 1 deletion .../java/diet/server/ConversationController/MazeGameConversationControllerMultipleDyads.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class MazeGameConversationControllerMultipleDyads extends DefaultConversa
JInterfaceSinglePressButtonFIVE jispb;
Vector participantsQueuedLLLL = new Vector();
Vector participantsQueuedRRRRR = new Vector();
Vector conversationControllers = new Vector();
// Vector conversationControllers = new Vector();

//MazeGameController2WAY mgc;
//MazeGameController2WAY mgc;
Expand Down
5 changes: 5 additions & 0 deletions ...java/diet/server/ConversationController/Telegram_Dyadic_Customizable_ReferentialTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ public void telegram_processTelegramMessageFromClient(TelegramParticipant sender
if(!text.startsWith("/")){
c.telegram_relayMessageTextToOtherParticipants(sender, tmfc);
}

/* if(text.contains("this")){
c.telegram_sendDelayedArtificialTurnFromApparentOriginToPermittedParticipants(sender, "oh and also that", 3000);
}
*/

}
if(this.relayPhotos && tmfc.u.hasMessage()&& tmfc.u.getMessage().hasPhoto()){
Expand Down
Loading

0 comments on commit 847e911

Please sign in to comment.