Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1244] trunk/applications
|
From: <jom...@us...> - 2008-04-23 15:22:11
|
Revision: 1244
http://jason.svn.sourceforge.net/jason/?rev=1244&view=rev
Author: jomifred
Date: 2008-04-23 08:22:04 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
improve org. spec of the team
Modified Paths:
--------------
trunk/applications/jason-moise/lib/moise.jar
trunk/applications/jason-moise/src/jmoise/OrgManager.java
trunk/applications/jason-team/AC-Local-JasonTeam.mas2j
trunk/applications/jason-team/src/asl/gaucho.asl
trunk/applications/jason-team/src/java/arch/CowboyArch.java
trunk/applications/jason-team/src/team-os.xml
Modified: trunk/applications/jason-moise/lib/moise.jar
===================================================================
(Binary files differ)
Modified: trunk/applications/jason-moise/src/jmoise/OrgManager.java
===================================================================
--- trunk/applications/jason-moise/src/jmoise/OrgManager.java 2008-04-22 22:09:11 UTC (rev 1243)
+++ trunk/applications/jason-moise/src/jmoise/OrgManager.java 2008-04-23 15:22:04 UTC (rev 1244)
@@ -67,9 +67,8 @@
// starts GUI
if ("yes".equals(getTS().getSettings().getUserParameter("gui"))) {
try {
- simOE = new SimOE(currentOE);
+ simOE = new SimOE(currentOE, false);
simOE.setName("OrgManager");
- simOE.frame.getContentPane().remove(simOE.frame.OESimTabPanel);
simOE.frame.addWindowListener(new java.awt.event.WindowAdapter() {
public void windowClosing(java.awt.event.WindowEvent e) {
if (simOE != null) {
Modified: trunk/applications/jason-team/AC-Local-JasonTeam.mas2j
===================================================================
--- trunk/applications/jason-team/AC-Local-JasonTeam.mas2j 2008-04-22 22:09:11 UTC (rev 1243)
+++ trunk/applications/jason-team/AC-Local-JasonTeam.mas2j 2008-04-23 15:22:04 UTC (rev 1244)
@@ -10,7 +10,7 @@
infrastructure: Centralised
agents:
- orgManager [osfile="src/team-os.xml",gui=yes]
+ orgManager [osfile="src/team-os.xml",gui=no]
agentArchClass jmoise.OrgManager;
gaucho1 gaucho.asl
Modified: trunk/applications/jason-team/src/asl/gaucho.asl
===================================================================
--- trunk/applications/jason-team/src/asl/gaucho.asl 2008-04-22 22:09:11 UTC (rev 1243)
+++ trunk/applications/jason-team/src/asl/gaucho.asl 2008-04-23 15:22:04 UTC (rev 1244)
@@ -18,18 +18,40 @@
/* -- initial beliefs -- */
-/* -- create the initial exploration groups -- */
+/* -- initial goals -- */
+!test.
++!test <- +gsize(16,8).
+
+/* -- create the initial exploration groups and areas -- */
+
++gsize(_Weight,_Height) // new match've started
+ : .my_name(gaucho1)
+ <- .if( group(team,Old), {
+ jmoise.remove_group(Old)
+ });
+ .abolish(area(_,_,_,_,_));
+ jmoise.create_group(team).
+gsize(Weight,Height)
- : .my_name(gaucho1)
- <- jmoise.create_group(team).
+ <- .abolish(area(_,_,_,_,_)).
+
+group(team,GId)
: .my_name(gaucho1)
<- jmoise.create_group(exploration,GId);
jmoise.create_group(exploration,GId);
jmoise.create_group(exploration,GId).
++group(exploration,_) // compute the area of the groups
+ : .my_name(gaucho1) &
+ .findall(GId, group(exploration,GId), LG) &
+ LG = [G1,G2,G3] // there are three groups
+ <- ?gsize(W,H);
+ X = math.round(((W*H)/3)/H);
+ +area(G1, 0, 0, X, H-1);
+ +area(G2, X+1, 0, W-1, H/2);
+ +area(G3, X+1, (H/2)+1, W-1, H-1).
++area(G,A,B,C,D)[source(self)]
+ <- .broadcast(tell, area(G,A,B,C,D)).
-
// include common plans for MOISE+ agents
{ include("moise-common.asl") }
Modified: trunk/applications/jason-team/src/java/arch/CowboyArch.java
===================================================================
--- trunk/applications/jason-team/src/java/arch/CowboyArch.java 2008-04-22 22:09:11 UTC (rev 1243)
+++ trunk/applications/jason-team/src/java/arch/CowboyArch.java 2008-04-23 15:22:04 UTC (rev 1244)
@@ -30,7 +30,7 @@
*/
public class CowboyArch extends IdentifyCrashed {
- LocalWorldModel model = null;
+ LocalWorldModel model = new LocalWorldModel(10,10);
WorldView view = null;
String simId = null;
Modified: trunk/applications/jason-team/src/team-os.xml
===================================================================
--- trunk/applications/jason-team/src/team-os.xml 2008-04-22 22:09:11 UTC (rev 1243)
+++ trunk/applications/jason-team/src/team-os.xml 2008-04-23 15:22:04 UTC (rev 1244)
@@ -5,7 +5,7 @@
<organisational-specification
id="jason-cowboys"
- os-version="0.4"
+ os-version="0.5"
xmlns='http://moise.sourceforge.net/os'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
@@ -13,6 +13,10 @@
http://moise.sourceforge.net/xml/os.xsd' >
<structural-specification>
+ <properties>
+ <property id="check-players-in-remove-group" value="false" />
+ <property id="check-sub-group-in-remove-group" value="false" />
+ </properties>
<role-definitions>
<role id="cowboy" />
@@ -24,6 +28,7 @@
</role-definitions>
<group-specification id="team">
+
<links>
<link from="cowboy" to="cowboy" type="communication"
scope="inter-group" extends-sub-groups="true" bi-dir="false"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
