1c1
< -- ail.rpd
---
> -- parameters.rpd
13a14,15
> -- CHANGES FROM VERSION 1: i will try to add parameters to see if they 
> -- are moving around correctly.
15a18,28
> -- types of objects
> 
> 
> type Address is string;
> type HTML is integer;
> type IPAddress is string;
> type ClientAction is string;
> type ActionResponse is float;
> type DatabaseAdvice is string;
> 
> 
20,21c33,35
< action in  ReceiveWebDocument();
<        out  RequestWebDocument(), SendAddressLocation();
---
> action in  ReceiveWebDocument(H : HTML);
>        out  RequestWebDocument(A : Address), 
> 	    SendAddressLocation(I : IPAddress);
22a37,38
>    A : Address is "http:\\www.dinosaurs.com";
>    I : IPAddress is "36.216.0.211";
24,25c40,41
<    start ||> RequestWebDocument;;
<    start ||> SendAddressLocation;;
---
>    start ||> RequestWebDocument(A);;
>    start ||> SendAddressLocation(I);;
30,31c46,48
< action in  ReceiveServerResponse(), ReceiveCoachingHelp();
<        out  SendActionRequest();
---
> action in  ReceiveServerResponse(R : ActionResponse), 
> 	   ReceiveCoachingHelp(D : DatabaseAdvice);
>        out  SendActionRequest(C : ClientAction);
32a50
>    C : ClientAction is "Add Node";
34c52
<    start ||> SendActionRequest;;
---
>    start ||> SendActionRequest(C);;
42,43c60,63
< action in  InWebDocument(), InServerResponse(), InCoachingHelp();
<        out  OutActionRequest(), OutDocumentRequest(), OutAddress();
---
> action in  InWebDocument(H : HTML), InServerResponse(R : ActionResponse), 
> 	   InCoachingHelp(D : DatabaseAdvice);
>        out  OutActionRequest(C: ClientAction), 
> 	    OutDocumentRequest(A : Address), OutAddress(I : IPAddress);
51,56c71,77
<    WB.RequestWebDocument ||> OutDocumentRequest;
<    WB.SendAddressLocation ||> OutAddress;
<    InWebDocument ||> WB.ReceiveWebDocument;
<    JT.SendActionRequest ||> OutActionRequest;
<    InServerResponse ||> JT.ReceiveServerResponse;
<    InCoachingHelp ||> JT.ReceiveCoachingHelp;
---
>    (?A in Address) WB.RequestWebDocument(?A) ||> OutDocumentRequest(?A);
>    (?I in IPAddress) WB.SendAddressLocation(?I) ||> OutAddress(?I);
>    (?H in HTML) InWebDocument(?H) ||> WB.ReceiveWebDocument(?H);
>    (?C in ClientAction) JT.SendActionRequest(?C) ||> OutActionRequest(?C);
>    (?R in ActionResponse) InServerResponse(?R) ||> 
> 	JT.ReceiveServerResponse(?R);
>    (?D in DatabaseAdvice) InCoachingHelp(?D) ||> JT.ReceiveCoachingHelp(?D);
64,68c85,93
< action in  ReceiveDocumentRequest(), ReceiveQueryResult(), 
< 	   ReceiveReturnCode(), ReceiveActionRequest(), ReceiveAddress();
<        out  SendWebDocument(), SendServerResponse(), SendQueryOrUpdate(), 
< 	    NotifyActionToCoach(), NotifyActionToConMan(),
< 	    SendAddressToLog();
---
> action in  ReceiveDocumentRequest(A : Address), 
> 	   ReceiveQueryResult(R : ActionResponse), 
> 	   ReceiveReturnCode(), ReceiveActionRequest(C : ClientAction), 
> 	   ReceiveAddress(I : IPAddress);
>        out  SendWebDocument(H : HTML), SendServerResponse(R : ActionResponse), 
> 	    SendQueryOrUpdate(C : ClientAction), 
> 	    NotifyActionToCoach(C : ClientAction), 
>             NotifyActionToConMan(C : ClientAction), 
>             SendAddressToLog(I : IPAddress);
69a95
>    H : HTML is 23;
71,76c97,102
<    ReceiveAddress ||> SendAddressToLog;;
<    ReceiveDocumentRequest ||> SendWebDocument;;
<    ReceiveActionRequest ||> SendQueryOrUpdate;;
<    ReceiveActionRequest ||> NotifyActionToCoach;;
<    ReceiveActionRequest ||> NotifyActionToConMan;;
<    ReceiveQueryResult ||> SendServerResponse;;
---
>    (?I in IPAddress) ReceiveAddress(?I) ||> SendAddressToLog(?I);;
>    (?A in Address) ReceiveDocumentRequest(?A) ||> SendWebDocument(H);;
>    (?C in ClientAction) ReceiveActionRequest(?C) ||> SendQueryOrUpdate(?C);;
>    (?C in ClientAction) ReceiveActionRequest(?C) ||> NotifyActionToCoach(?C);;
>    (?C in ClientAction) ReceiveActionRequest(?C) ||> NotifyActionToConMan(?C);;
>    (?R in ActionResponse) ReceiveQueryResult(?R) ||> SendServerResponse(?R);;
81,82c107,108
< action in  ReceiveHTTPAddress();
<        out  SendAddressToTracker();
---
> action in  ReceiveHTTPAddress(I : IPAddress);
>        out  SendAddressToTracker(I : IPAddress);
85c111
<    ReceiveHTTPAddress ||> SendAddressToTracker;;
---
>    (?I in IPAddress) ReceiveHTTPAddress(?I) ||> SendAddressToTracker(?I);;
90c116
< action in  ReceiveAddress();
---
> action in  ReceiveAddress(I : IPAddress);
95,96c121,124
< action in  ReceiveQueryOrUpdate(), ReceiveCoachQuery();
<        out  DispatchQueryResultToCGI(), DispatchQueryResultToCoach();
---
> action in  ReceiveQueryOrUpdate(C: ClientAction), 
>            ReceiveCoachQuery(C : ClientAction);
>        out  DispatchQueryResultToCGI(R : ActionResponse), 
> 	    DispatchQueryResultToCoach(D : DatabaseAdvice);
97a126,127
>    R : ActionResponse is 12.07;
>    D : DatabaseAdvice is "???";
99,100c129,132
<    ReceiveQueryOrUpdate ||> DispatchQueryResultToCGI;;
<    ReceiveCoachQuery ||> DispatchQueryResultToCoach;;
---
>    (?C in ClientAction) ReceiveQueryOrUpdate(?C) ||> 
> 	DispatchQueryResultToCGI(R);;
>    (?C in ClientAction) ReceiveCoachQuery(?C) ||> 
> 	DispatchQueryResultToCoach(D);;
105,106c137,139
< action in  ActionNotification(), ReceiveQueryResult();
<        out  SendHelpToClient(), SendQuery();
---
> action in  ActionNotification(C : ClientAction), 
> 	   ReceiveQueryResult(D : DatabaseAdvice);
>        out  SendHelpToClient(D : DatabaseAdvice), SendQuery(C : ClientAction);
109,110c142,143
<    ActionNotification ||> SendQuery;;
<    ReceiveQueryResult ||> SendHelpToClient;;
---
>    (?C in ClientAction) ActionNotification(?C) ||> SendQuery(?C);;
>    (?D in DatabaseAdvice) ReceiveQueryResult(?D) ||> SendHelpToClient(?D);;
115c148
< action in  ActionNotification();
---
> action in  ActionNotification(C : ClientAction);
123,124c156,159
< action in  InActionRequest(), InDocumentRequest(), InAddress();
<        out  OutWebDocument(), OutServerResponse(), OutCoachingHelp();
---
> action in  InActionRequest(C : ClientAction), InDocumentRequest(A : Address), 
> 	   InAddress(I : IPAddress);
>        out  OutWebDocument(H : HTML), OutServerResponse(R : ActionResponse), 
> 	    OutCoachingHelp(D : DatabaseAdvice);
136,149c171,190
<    HTTP.SendWebDocument ||> OutWebDocument;
<    InAddress ||> HTTP.ReceiveAddress;
<    InDocumentRequest ||> HTTP.ReceiveDocumentRequest;
<    InActionRequest ||> HTTP.ReceiveActionRequest;
<    HTTP.SendServerResponse ||> OutServerResponse;
<    COACH.SendHelpToClient ||> OutCoachingHelp;
<    HTTP.SendAddressToLog ||> LOG.ReceiveHTTPAddress;
<    LOG.SendAddressToTracker ||> TRAC.ReceiveAddress;
<    HTTP.SendQueryOrUpdate ||> POST.ReceiveQueryOrUpdate;
<    POST.DispatchQueryResultToCGI ||> HTTP.ReceiveQueryResult;
<    HTTP.NotifyActionToCoach ||> COACH.ActionNotification;
<    COACH.SendQuery ||> POST.ReceiveCoachQuery;
<    POST.DispatchQueryResultToCoach ||> COACH.ReceiveQueryResult;
<    HTTP.NotifyActionToConMan ||> CONMAN.ActionNotification;
---
>    (?H in HTML) HTTP.SendWebDocument(?H) ||> OutWebDocument(?H);
>    (?I in IPAddress) InAddress(?I) ||> HTTP.ReceiveAddress(?I);
>    (?A in Address) InDocumentRequest(?A) ||> HTTP.ReceiveDocumentRequest(?A);
>    (?C in ClientAction) InActionRequest(?C) ||> HTTP.ReceiveActionRequest(?C);
>    (?R in ActionResponse) HTTP.SendServerResponse(?R) ||> 
> 	OutServerResponse(?R);
>    (?D in DatabaseAdvice) COACH.SendHelpToClient(?D) ||> OutCoachingHelp(?D);
>    (?I in IPAddress) HTTP.SendAddressToLog(?I) ||> LOG.ReceiveHTTPAddress(?I);
>    (?I in IPAddress) LOG.SendAddressToTracker(?I) ||> TRAC.ReceiveAddress(?I);
>    (?C in ClientAction) HTTP.SendQueryOrUpdate(?C) ||> 
> 	POST.ReceiveQueryOrUpdate(?C);
>    (?R in ActionResponse) POST.DispatchQueryResultToCGI(?R) ||> 
> 	HTTP.ReceiveQueryResult(?R);
>    (?C in ClientAction) HTTP.NotifyActionToCoach(?C) ||> 
> 	COACH.ActionNotification(?C);
>    (?C in ClientAction) COACH.SendQuery(?C) ||> POST.ReceiveCoachQuery(?C);
>    (?D in DatabaseAdvice) POST.DispatchQueryResultToCoach(?D) ||> 
> 	COACH.ReceiveQueryResult(?D);
>    (?C in ClientAction) HTTP.NotifyActionToConMan(?C) ||> 
> 	CONMAN.ActionNotification(?C);
161,166c202,207
<    C.OutDocumentRequest ||> S.InDocumentRequest;
<    C.OutAddress ||> S.InAddress;
<    C.OutActionRequest ||> S.InActionRequest;
<    S.OutWebDocument ||> C.InWebDocument;
<    S.OutServerResponse ||> C.InServerResponse;
<    S.OutCoachingHelp ||> C.InCoachingHelp;
---
>    (?A in Address) C.OutDocumentRequest(?A) ||> S.InDocumentRequest(?A);
>    (?I in IPAddress) C.OutAddress(?I) ||> S.InAddress(?I);
>    (?C in ClientAction) C.OutActionRequest(?C) ||> S.InActionRequest(?C);
>    (?H in HTML) S.OutWebDocument(?H) ||> C.InWebDocument(?H);
>    (?R in ActionResponse) S.OutServerResponse(?R) ||> C.InServerResponse(?R);
>    (?D in DatabaseAdvice) S.OutCoachingHelp(?D) ||> C.InCoachingHelp(?D);