balkian/SOJA
1
0
Fork 0
mirror of https://github.com/balkian/SOJA.git synced 2025-09-03 11:52:20 +00:00
Code Issues Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
Miguel Coronado
2012-03-22 19:57:42 +01:00
parent 8a517c87a0
commit 9bc4304a4a
10 changed files with 191 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/asl/travelAgent.asl
View File

@@ -11,6 +11,8 @@ contact(userAgent).
my_service(travel).
my_service(train).
fare(turista).
/************** Plans *****************/
/* Introduce myself to the user agent */
@@ -35,14 +37,14 @@ my_service(train).
@findTravel2
+!find(travel, Query) : not canFindTravel(Query) & delay(Query)
<- -delay(Query);
.print("Not enought data. Lets ask!").
.print("Not enought data. TODO:Lets ask!").
@findTravel3
+!find(travel, Query) : canFindTravel(Query)
<- ?location(to, To);
?location(from, From);
?date(departure, Day, Month, Year);
findTravel(From, To, Day, Month, Year);
findTravel(Query,From, To, Day, Month, Year);
.print("ok").
@findTravelFailureRety
@@ -53,8 +55,23 @@ my_service(train).
<- .print("Problema al encontrar viajes:", Msg);
!findTravel(Query).
+journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query), source(percept)]
: fare(FName)
<- +journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query)]. //note it down
+journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query), source(percept)]
: ~fare(FName)
<- true. // skip this
+journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query), source(percept)]
: not fare(_) & not ~fare(FName) // no restrictions, so note them all down
<- +journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query)].
/* log results */
@log_the_journey
+journey(From, To, Departure, Arrival, Fares) : true
<- .print("Travel found: From ", From,"<", Departure, "> to ", To, "<", Arrival, "> for ", Fares).
+journey(From, To, Departure, Arrival, fare(FName, FPrice))[query(Query), source(percept)]
: true
<- .print("Discard travel : From ", From,"<", Departure, "> to ", To, "<", Arrival, "> for ", Fares).