[
Back ]
1c1
< -- newail1.rpd
---
> -- twoclient.rpd
36c36,37
< AdviceToClient(T : TutorAdvice);
---
> AdviceToClient(T : TutorAdvice), GraphUpdate(G : GraphAnnotation),
> HighlightUpdate();
57c58,59
< AdviceToClient(T : TutorAdvice);
---
> AdviceToClient(T : TutorAdvice), GraphUpdate(G : GraphAnnotation),
> HighlightUpdate();
79a82,83
> (?G in GraphAnnotation) GraphUpdate(?G) ||> JT.GraphUpdate(?G);
> HighlightUpdate ||> JT.HighlightUpdate;
87,96c91,103
< action in WebDocumentRequest(A : Address), LinkRequests(L : Address),
< UseInfoInGraph(I : IPAddress; G : GraphAnnotation),
< JavaGraphChange(N : GraphAnnotation), RequestHelp(), Highlight();
< out HTMLPage(H : HTML), PageLinks(P : HTML),
< SendAddressToLog(A : Address),
< SendInfoToJava(I : IPAddress; G : GraphAnnotation),
< GraphUpdateToPostgres(G : GraphAnnotation),
< GraphUpdateToCoach(G : GraphAnnotation),
< GraphUpdateToConMan(G : GraphAnnotation), HelpRequestToCoach(),
< HighlightCommandToConMan();
---
> action in WebDocumentRequest(A : Address; C : Client),
> LinkRequests(L : Address; C : Client),
> UseInfoInGraph(I : IPAddress; G : GraphAnnotation; C : Client),
> JavaGraphChange(N : GraphAnnotation; C : Client),
> RequestHelp(C : Client), Highlight(C : Client);
> out HTMLPage(H : HTML; C : Client), PageLinks(P : HTML; C : Client),
> SendAddressToLog(A : Address; C : Client),
> SendInfoToJava(I : IPAddress; G : GraphAnnotation; C : Client),
> GraphUpdateToPostgres(G : GraphAnnotation; C : Client),
> GraphUpdateToCoach(G : GraphAnnotation; C : Client),
> GraphUpdateToConMan(G : GraphAnnotation; C : Client),
> HelpRequestToCoach(C : Client),
> HighlightCommandToConMan(C : Client);
101,116c108,128
< (?A in Address) WebDocumentRequest(?A) ||> HTMLPage(H);;
< (?A in Address) WebDocumentRequest(?A) ||> SendAddressToLog(?A);;
< (?L in Address) LinkRequests(?L) ||> PageLinks(P);;
< (?I in IPAddress, ?G in GraphAnnotation) UseInfoInGraph(?I, ?G) ||>
< SendInfoToJava(?I, ?G);;
< (?I in IPAddress, ?G in GraphAnnotation) UseInfoInGraph(?I, ?G) ||>
< GraphUpdateToPostgres(?G);;
< (?I in IPAddress, ?G in GraphAnnotation) UseInfoInGraph(?I, ?G) ||>
< GraphUpdateToCoach(?G);;
< (?I in IPAddress, ?G in GraphAnnotation) UseInfoInGraph(?I, ?G) ||>
< GraphUpdateToConMan(?G);;
< (?N in GraphAnnotation) JavaGraphChange(?N) ||> GraphUpdateToPostgres(?N);;
< (?N in GraphAnnotation) JavaGraphChange(?N) ||> GraphUpdateToCoach(?N);;
< (?N in GraphAnnotation) JavaGraphChange(?N) ||> GraphUpdateToConMan(?N);;
< RequestHelp ||> HelpRequestToCoach;;
< Highlight ||> HighlightCommandToConMan;;
---
> (?A in Address, ?C in Client) WebDocumentRequest(?A, ?C) ||>
> HTMLPage(H, ?C);;
> (?A in Address, ?C in Client) WebDocumentRequest(?A, ?C) ||>
> SendAddressToLog(?A, ?C);;
> (?L in Address, ?C in Client) LinkRequests(?L, ?C) ||> PageLinks(P, ?C);;
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> UseInfoInGraph(?I, ?G, ?C) ||> SendInfoToJava(?I, ?G, ?C);;
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> UseInfoInGraph(?I, ?G, ?C) ||> GraphUpdateToPostgres(?G, ?C);;
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> UseInfoInGraph(?I, ?G, ?C) ||> GraphUpdateToCoach(?G, ?C);;
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> UseInfoInGraph(?I, ?G, ?C) ||> GraphUpdateToConMan(?G, ?C);;
> (?N in GraphAnnotation, ?C in Client) JavaGraphChange(?N, ?C) ||>
> GraphUpdateToPostgres(?N, ?C);;
> (?N in GraphAnnotation, ?C in Client) JavaGraphChange(?N, ?C) ||>
> GraphUpdateToCoach(?N, ?C);;
> (?N in GraphAnnotation, ?C in Client) JavaGraphChange(?N, ?C) ||>
> GraphUpdateToConMan(?N, ?C);;
> (?C in Client) RequestHelp(?C) ||> HelpRequestToCoach(?C);;
> (?C in Client) Highlight(?C) ||> HighlightCommandToConMan(?C);;
121,122c133,134
< action in ReceiveHTTPAddress(A : Address);
< out SendAddressToTracker(A : Address);
---
> action in ReceiveHTTPAddress(A : Address; C : Client);
> out SendAddressToTracker(A : Address; C : Client);
125c137,138
< (?A in Address) ReceiveHTTPAddress(?A) ||> SendAddressToTracker(?A);;
---
> (?A in Address, ?C in Client) ReceiveHTTPAddress(?A, ?C) ||>
> SendAddressToTracker(?A, ?C);;
130c143
< action in ReceiveAddress(A : Address);
---
> action in ReceiveAddress(A : Address; C : Client);
135,137c148,150
< action in GraphUpdateToPostgres(G : GraphAnnotation),
< QueryToDatabase(Q : Question);
< out FeedbackToCoach(F : Feedback);
---
> action in GraphUpdateToPostgres(G : GraphAnnotation; C : Client),
> QueryToDatabase(Q : Question; C : Client);
> out FeedbackToCoach(F : Feedback; C : Client);
141c154,155
< (?Q in Question) QueryToDatabase(?Q) ||> FeedbackToCoach(F);;
---
> (?Q in Question, ?C in Client) QueryToDatabase(?Q, ?C) ||>
> FeedbackToCoach(F, ?C);;
146,148c160,164
< action in GraphUpdateToCoach(G : GraphAnnotation),
< FeedbackToCoach(F : Feedback), HelpRequestToCoach();
< out QueryToDatabase(Q : Question), AdviceToClient(T : TutorAdvice);
---
> action in GraphUpdateToCoach(G : GraphAnnotation; C : Client),
> FeedbackToCoach(F : Feedback; C : Client),
> HelpRequestToCoach(C : Client);
> out QueryToDatabase(Q : Question; C : Client),
> AdviceToClient(T : TutorAdvice; C : Client);
153,155c169,173
< (?G in GraphAnnotation) GraphUpdateToCoach(?G) ||> QueryToDatabase(Q);;
< (?F in Feedback) FeedbackToCoach(?F) ||> AdviceToClient(T);;
< HelpRequestToCoach ||> QueryToDatabase(Q);;
---
> (?G in GraphAnnotation, ?C in Client) GraphUpdateToCoach(?G, ?C) ||>
> QueryToDatabase(Q, ?C);;
> (?F in Feedback, ?C in Client) FeedbackToCoach(?F, ?C) ||>
> AdviceToClient(T, ?C);;
> (?C in Client) HelpRequestToCoach(?C) ||> QueryToDatabase(Q, ?C);;
160c178,186
< action in GraphUpdateToConMan(G : GraphAnnotation), Highlight();
---
> action in GraphUpdateToConMan(G : GraphAnnotation; C : Client),
> Highlight(C : Client);
> out UpdateToOtherClient(G : GraphAnnotation; C : Client),
> UpdateHighlightToOtherClient(C : Client);
> behavior
> begin
> (?G in GraphAnnotation, ?C in Client) GraphUpdateToConMan(?G, ?C) ||>
> UpdateToOtherClient(?G, ?C);;
> (?C in Client) Highlight(?C) ||> UpdateHighlightToOtherClient(?C);;
168,173c194,203
< action in WebDocumentRequest(A : Address), LinkRequests(L : Address),
< UseInfoInGraph(I : IPAddress; G : GraphAnnotation), RequestHelp(),
< JavaGraphChange(N : GraphAnnotation), Highlight();
< out HTMLPage(H : HTML), PageLinks(P : HTML),
< SendInfoToJava(I : IPAddress; G : GraphAnnotation),
< AdviceToClient(T : TutorAdvice);
---
> action in WebDocumentRequest(A : Address; C : Client),
> LinkRequests(L : Address; C : Client),
> UseInfoInGraph(I : IPAddress; G : GraphAnnotation; C : Client),
> RequestHelp(C : Client), Highlight(C : Client),
> JavaGraphChange(N : GraphAnnotation; C : Client);
> out HTMLPage(H : HTML; C : Client), PageLinks(P : HTML; C : Client),
> SendInfoToJava(I : IPAddress; G : GraphAnnotation; C : Client),
> AdviceToClient(T : TutorAdvice; C : Client),
> UpdateToOtherClient(G : GraphAnnotation; C : Client),
> UpdateHighlightToOtherClient(C : Client);
185,208c215,250
< (?A in Address) WebDocumentRequest(?A) ||> HTTP.WebDocumentRequest(?A);
< (?A in Address) HTTP.SendAddressToLog(?A) ||> LOG.ReceiveHTTPAddress(?A);
< (?A in Address) LOG.SendAddressToTracker(?A) ||> TRAC.ReceiveAddress(?A);
< (?H in HTML) HTTP.HTMLPage(?H) ||> HTMLPage(?H);
< (?L in Address) LinkRequests(?L) ||> HTTP.LinkRequests(?L);
< (?P in HTML) HTTP.PageLinks(?P) ||> PageLinks(?P);
< (?I in IPAddress, ?G in GraphAnnotation) UseInfoInGraph(?I, ?G) ||>
< HTTP.UseInfoInGraph(?I, ?G);
< (?I in IPAddress, ?G in GraphAnnotation) HTTP.SendInfoToJava(?I, ?G) ||>
< SendInfoToJava(?I, ?G);
< (?G in GraphAnnotation) HTTP.GraphUpdateToPostgres(?G) ||>
< POST.GraphUpdateToPostgres(?G);
< (?G in GraphAnnotation) HTTP.GraphUpdateToCoach(?G) ||>
< COACH.GraphUpdateToCoach(?G);
< (?G in GraphAnnotation) HTTP.GraphUpdateToConMan(?G) ||>
< CONMAN.GraphUpdateToConMan(?G);
< (?N in GraphAnnotation) JavaGraphChange(?N) ||> HTTP.JavaGraphChange(?N);
< (?Q in Question) COACH.QueryToDatabase(?Q) ||> POST.QueryToDatabase(?Q);
< (?F in Feedback) POST.FeedbackToCoach(?F) ||> COACH.FeedbackToCoach(?F);
< (?T in TutorAdvice) COACH.AdviceToClient(?T) ||> AdviceToClient(?T);
< RequestHelp ||> HTTP.RequestHelp;
< HTTP.HelpRequestToCoach ||> COACH.HelpRequestToCoach;
< Highlight ||> HTTP.Highlight;
< HTTP.HighlightCommandToConMan ||> CONMAN.Highlight;
---
> (?A in Address, ?C in Client) WebDocumentRequest(?A, ?C) ||>
> HTTP.WebDocumentRequest(?A, ?C);
> (?A in Address, ?C in Client) HTTP.SendAddressToLog(?A, ?C) ||>
> LOG.ReceiveHTTPAddress(?A, ?C);
> (?A in Address, ?C in Client) LOG.SendAddressToTracker(?A, ?C) ||>
> TRAC.ReceiveAddress(?A, ?C);
> (?H in HTML, ?C in Client) HTTP.HTMLPage(?H, ?C) ||> HTMLPage(?H, ?C);
> (?L in Address, ?C in Client) LinkRequests(?L, ?C) ||>
> HTTP.LinkRequests(?L, ?C);
> (?P in HTML, ?C in Client) HTTP.PageLinks(?P, ?C) ||> PageLinks(?P, ?C);
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> UseInfoInGraph(?I, ?G, ?C) ||> HTTP.UseInfoInGraph(?I, ?G, ?C);
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> HTTP.SendInfoToJava(?I, ?G, ?C) ||> SendInfoToJava(?I, ?G, ?C);
> (?G in GraphAnnotation, ?C in Client) HTTP.GraphUpdateToPostgres(?G, ?C) ||>
> POST.GraphUpdateToPostgres(?G, ?C);
> (?G in GraphAnnotation, ?C in Client) HTTP.GraphUpdateToCoach(?G, ?C) ||>
> COACH.GraphUpdateToCoach(?G, ?C);
> (?G in GraphAnnotation, ?C in Client) HTTP.GraphUpdateToConMan(?G, ?C) ||>
> CONMAN.GraphUpdateToConMan(?G, ?C);
> (?N in GraphAnnotation, ?C in Client) JavaGraphChange(?N, ?C) ||>
> HTTP.JavaGraphChange(?N, ?C);
> (?Q in Question, ?C in Client) COACH.QueryToDatabase(?Q, ?C) ||>
> POST.QueryToDatabase(?Q, ?C);
> (?F in Feedback, ?C in Client) POST.FeedbackToCoach(?F, ?C) ||>
> COACH.FeedbackToCoach(?F, ?C);
> (?T in TutorAdvice, ?C in Client) COACH.AdviceToClient(?T, ?C) ||>
> AdviceToClient(?T, ?C);
> (?C in Client) RequestHelp(?C) ||> HTTP.RequestHelp(?C);
> (?C in Client) HTTP.HelpRequestToCoach(?C) ||> COACH.HelpRequestToCoach(?C);
> (?C in Client) Highlight(?C) ||> HTTP.Highlight(?C);
> (?C in Client) HTTP.HighlightCommandToConMan(?C) ||> CONMAN.Highlight(?C);
> (?G in GraphAnnotation, ?C in Client) CONMAN.UpdateToOtherClient(?G, ?C) ||>
> UpdateToOtherClient(?G, ?C);
> (?C in Client) CONMAN.UpdateHighlightToOtherClient(?C) ||>
> UpdateHighlightToOtherClient(?C);
217c259
< C : Client is ClientArch();
---
> C1, C2 : Client is ClientArch();
220,231c262,283
< (?A in Address) C.WebDocumentRequest(?A) ||> S.WebDocumentRequest(?A);
< (?H in HTML) S.HTMLPage(?H) ||> C.HTMLPage(?H);
< (?L in Address) C.LinkRequests(?L) ||> S.LinkRequests(?L);
< (?P in HTML) S.PageLinks(?P) ||> C.PageLinks(?P);
< (?I in IPAddress, ?G in GraphAnnotation) C.UseInfoInGraph(?I, ?G) ||>
< S.UseInfoInGraph(?I, ?G);
< (?I in IPAddress, ?G in GraphAnnotation) S.SendInfoToJava(?I, ?G) ||>
< C.SendInfoToJava(?I, ?G);
< (?N in GraphAnnotation) C.JavaGraphChange(?N) ||> S.JavaGraphChange(?N);
< (?T in TutorAdvice) S.AdviceToClient(?T) ||> C.AdviceToClient(?T);
< C.RequestHelp ||> S.RequestHelp;
< C.Highlight ||> S.Highlight;
---
> (?A in Address, ?C in Client) ?C.WebDocumentRequest(?A) ||>
> S.WebDocumentRequest(?A, ?C);
> (?H in HTML, ?C in Client) S.HTMLPage(?H, ?C) ||> ?C.HTMLPage(?H);
> (?L in Address, ?C in Client) ?C.LinkRequests(?L) ||>
> S.LinkRequests(?L, ?C);
> (?P in HTML, ?C in Client) S.PageLinks(?P, ?C) ||> ?C.PageLinks(?P);
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> ?C.UseInfoInGraph(?I, ?G) ||> S.UseInfoInGraph(?I, ?G, ?C);
> (?I in IPAddress, ?G in GraphAnnotation, ?C in Client)
> S.SendInfoToJava(?I, ?G, ?C) ||> ?C.SendInfoToJava(?I, ?G);
> (?N in GraphAnnotation, ?C in Client) ?C.JavaGraphChange(?N) ||>
> S.JavaGraphChange(?N, ?C);
> (?T in TutorAdvice, ?C in Client) S.AdviceToClient(?T, ?C) ||>
> ?C.AdviceToClient(?T);
> (?C in Client) ?C.RequestHelp ||> S.RequestHelp(?C);
> (?C in Client) ?C.Highlight ||> S.Highlight(?C);
> (?G in GraphAnnotation) S.UpdateToOtherClient(?G, C1) ||>
> C2.GraphUpdate(?G);
> (?G in GraphAnnotation) S.UpdateToOtherClient(?G, C2) ||>
> C1.GraphUpdate(?G);
> S.UpdateHighlightToOtherClient(C1) ||> C2.HighlightUpdate;
> S.UpdateHighlightToOtherClient(C2) ||> C1.HighlightUpdate;
[
Back ]