Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1302] trunk/applications/jason-team
|
From: <jom...@us...> - 2008-05-24 17:09:52
|
Revision: 1302
http://jason.svn.sourceforge.net/jason/?rev=1302&view=rev
Author: jomifred
Date: 2008-05-24 10:09:49 -0700 (Sat, 24 May 2008)
Log Message:
-----------
jason team: fix bug broacast cows
Modified Paths:
--------------
trunk/applications/jason-team/AC-Local-JasonTeam.mas2j
trunk/applications/jason-team/src/asl/gaucho.asl
trunk/applications/jason-team/src/java/agent/UniqueBelsBB.java
Modified: trunk/applications/jason-team/AC-Local-JasonTeam.mas2j
===================================================================
--- trunk/applications/jason-team/AC-Local-JasonTeam.mas2j 2008-05-24 15:15:42 UTC (rev 1301)
+++ trunk/applications/jason-team/AC-Local-JasonTeam.mas2j 2008-05-24 17:09:49 UTC (rev 1302)
@@ -19,42 +19,42 @@
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
gaucho2 gaucho.asl
[verbose=1,host="localhost", port=12300, username=participant2, password="2"]
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
gaucho3 gaucho.asl
[verbose=1,host="localhost", port=12300, username=participant3, password="3"]
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
gaucho4 gaucho.asl
[verbose=1,host="localhost", port=12300, username=participant4, password="4"]
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
gaucho5 gaucho.asl
[verbose=1,host="localhost", port=12300, username=participant5, password="5"]
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
gaucho6 gaucho.asl
[verbose=1,host="localhost", port=12300, username=participant6, password="6"]
agentArchClass arch.ACArchitecture
agentClass agent.SelectEvent
beliefBaseClass agent.UniqueBelsBB("gsize(_,_)","steps(_)","ally_pos(key,_,_)","corral(_,_,_,_)",
- "target(_,_)", "group_leader(key,_)", "cow(key,_,_)",
+ "target(_,_)", "group_leader(key,_)", //"cow(key,_,_)",
"group_area(key, _)");
directives: maintenance_goal = agent.OrgMaintenanceGoal;
Modified: trunk/applications/jason-team/src/asl/gaucho.asl
===================================================================
--- trunk/applications/jason-team/src/asl/gaucho.asl 2008-05-24 15:15:42 UTC (rev 1301)
+++ trunk/applications/jason-team/src/asl/gaucho.asl 2008-05-24 17:09:49 UTC (rev 1302)
@@ -43,6 +43,16 @@
!remove_org.
+!restart.
+
+/*
+se for impar
+ create_gr
+se for par
+ 1. tenta entrar explorer
+ 2.a tenta herding
+ 2.b no que tem o menor nro de vacas
+*/
+
//<- //.print("*** restart ***");
//.drop_all_desires;
//.abolish(cow(_,_,_)).
@@ -54,13 +64,16 @@
//+!share_seen_cows[scheme(Sch)] <- .print("ooo start sharing cows in scheme ",Sch); .suspend.
-// simple implementation of share_cows (see TODO above)
+// simple implementation of share_cows
+cow(Id,X,Y)[source(percept)]
- : .my_name(Me) & play(Me,_,Gr) // .intend(share_seen_cows)
- <- jmoise.broadcast(Gr, tell, cow(Id,X,Y)).
+ : .my_name(Me) & play(Me,_,Gr) & (play(Leader,explorer,Gr) | play(Leader,herder,Gr)) // .intend(share_seen_cows)
+ <- //.print("ooo broadcast ",cow(Id,X,Y));
+ //jmoise.broadcast(Gr, tell, cow(Id,X,Y)).
+ .send(Leader, tell, cow(Id,X,Y)).
-cow(Id,X,Y)[source(percept)]
- : .my_name(Me) & play(Me,_,Gr) // .intend(share_seen_cows)
- <- jmoise.broadcast(Gr, untell, cow(Id,X,Y)).
+ : .my_name(Me) & play(Me,_,Gr) & (play(Leader,explorer,Gr) | play(Leader,herder,Gr)) // .intend(share_seen_cows)
+ <- //jmoise.broadcast(Gr, untell, cow(Id,X,Y)).
+ .send(Leader, untell, cow(Id,X,Y)).
/* -- general organisational plans -- */
Modified: trunk/applications/jason-team/src/java/agent/UniqueBelsBB.java
===================================================================
--- trunk/applications/jason-team/src/java/agent/UniqueBelsBB.java 2008-05-24 15:15:42 UTC (rev 1301)
+++ trunk/applications/jason-team/src/java/agent/UniqueBelsBB.java 2008-05-24 17:09:49 UTC (rev 1302)
@@ -51,6 +51,9 @@
while (relevant.hasNext() && !remove) {
linbb = relevant.next();
+ // check equality of all terms that are "key"
+ // if some key is different, no problem
+ // otherwise, remove the current bel
boolean equals = true;
for (int i = 0; i<kbArity; i++) {
Term kbt = kb.getTerm(i);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
