Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1356] trunk
|
From: <jom...@us...> - 2008-08-19 09:19:18
|
Revision: 1356
http://jason.svn.sourceforge.net/jason/?rev=1356&view=rev
Author: jomifred
Date: 2008-08-19 09:19:09 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
fix minor issue in Jade/saci infra related to source path
Modified Paths:
--------------
trunk/applications/jason-team/src/asl/exploration.asl
trunk/applications/jason-team/src/asl/gaucho.asl
trunk/applications/jason-team/src/asl/herding.asl
trunk/demos/suspend-resume/test.asl
trunk/doc/index.html
trunk/examples/auction/AuctioneerGUI.java
trunk/examples/cleaning-robots/MarsEnv.java
trunk/examples/food-simulation/FoodSimulation.mas2j
trunk/examples/food-simulation/src/java/FoodEnvironment.java
trunk/src/jason/asSyntax/NumberTermImpl.java
trunk/src/jason/asSyntax/Pred.java
trunk/src/jason/asSyntax/Structure.java
trunk/src/jason/asSyntax/directives/Include.java
trunk/src/jason/infra/jade/JadeAgArch.java
trunk/src/jason/infra/saci/SaciAgArch.java
trunk/src/jason/mas2j/MAS2JProject.java
Modified: trunk/applications/jason-team/src/asl/exploration.asl
===================================================================
--- trunk/applications/jason-team/src/asl/exploration.asl 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/applications/jason-team/src/asl/exploration.asl 2008-08-19 09:19:09 UTC (rev 1356)
@@ -142,7 +142,7 @@
+!change_to_herding[scheme(Sch),mission(Mission)]
: cow(_,_,_)
<- .print("ooo I see some cows, create the herding group");
- // check these cows are being herded by other group
+ // check whether the seen cows are being herded by other group
.findall(L, group_leader(_,L),Leaders);
!ask_all_cows(Leaders,LCows);
.findall(cow(ID,X,Y), cow(ID,X,Y), MyCows);
Modified: trunk/applications/jason-team/src/asl/gaucho.asl
===================================================================
--- trunk/applications/jason-team/src/asl/gaucho.asl 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/applications/jason-team/src/asl/gaucho.asl 2008-08-19 09:19:09 UTC (rev 1356)
@@ -58,7 +58,7 @@
!create_exploration_gr.
+!restart
<- .print("*** restart -- even ***");
- !quite_all_missions_roles;
+ !quit_all_missions_roles;
.my_name(Me);
// try to adopt scouter in some exploration
@@ -66,10 +66,10 @@
!try_adopt(scouter,LGE);
// if I still have no role, try herdboy
- if ( not play(Me,_,_) ) {
+ if ( not play(Me,_,_) ) {
.findall(GH, group(herding_grp,GH), LGH);
!try_adopt(herdboy,LGH)
- }.
+ }.
+!try_adopt(_Role,[]).
+!try_adopt(Role,[G|_])
@@ -135,7 +135,7 @@
.findall(Boy,play(Boy,herdboy,G),HerdBoys);
.send(HerdBoys, achieve, change_role(herdboy,GT))
};
- !quite_all_missions_roles;
+ !quit_all_missions_roles;
jmoise.adopt_role(NewRole,GT).
// causes a loop:
@@ -148,7 +148,7 @@
<- .print("ooo Adopting role ",Role," in group ",Group,", as asked by ",Ag);
jmoise.adopt_role(Role, Group).
-+!quite_all_missions_roles
++!quit_all_missions_roles
<- .my_name(Me);
// give up all missions
Modified: trunk/applications/jason-team/src/asl/herding.asl
===================================================================
--- trunk/applications/jason-team/src/asl/herding.asl 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/applications/jason-team/src/asl/herding.asl 2008-08-19 09:19:09 UTC (rev 1356)
@@ -98,6 +98,7 @@
.send(gaucho5,achieve,create_exploration_gr);
.send(gaucho6,achieve,restart).
*/
+// TODO: find a nice solution for this plan!
+!release_boys[scheme(Sch),mission(Mission),group(Gr)]
: .count(play(_,herdboy,Gr),N) &
(N > 3 | (N > 1 & current_cluster(CAsList) & .length(CAsList) < 5))
Modified: trunk/demos/suspend-resume/test.asl
===================================================================
--- trunk/demos/suspend-resume/test.asl 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/demos/suspend-resume/test.asl 2008-08-19 09:19:09 UTC (rev 1356)
@@ -12,7 +12,7 @@
<- .print(".");
!!dots.
-// another loop that resumes and suspend the start
+// another loop that resumes and suspend the "dops" goal
+!control
<- .wait(30);
.suspend(dots); // suspend the intention with goal dots
Modified: trunk/doc/index.html
===================================================================
--- trunk/doc/index.html 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/doc/index.html 2008-08-19 09:19:09 UTC (rev 1356)
@@ -40,7 +40,8 @@
<li><a href="http://sourceforge.net/mail/?group_id=98417">Mailing lists</a>
<li><a href="http://jason.sourceforge.net/JasonWebSite/Examples/Examples.html">Examples</a>
<li><a href="http://jason.sourceforge.net/JasonWebSite/Demos.html">Demos</a>
- <li><a href="http://jason.sourceforge.net/JasonWebSite/Publications.html">Publications</a>
+ <li><a href="http://jason.sourceforge.net/JasonWebSite/Documents.html">Publications</a>
+ <li><a href="http://jason.sourceforge.net/JasonWebSite/Related%20Projects.html">Related projects</a>
</ul>
</li>
<br/>
Modified: trunk/examples/auction/AuctioneerGUI.java
===================================================================
--- trunk/examples/auction/AuctioneerGUI.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/examples/auction/AuctioneerGUI.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -41,9 +41,13 @@
if (action.getActionTerm().getFunctor().startsWith("show_winner")) {
jt.append("Winner of auction " + action.getActionTerm().getTerm(0));
jt.append(" is " + action.getActionTerm().getTerm(1) + "\n");
- auction.setEnabled(true);
+ action.setResult(true);
+ feedback.add(action);
+
+ auction.setEnabled(true); // enable GUI button
+ } else {
+ super.act(action,feedback); // send the action to the environment to be performed.
}
- super.act(action,feedback); // send the action to the environment to be performed.
}
public void stopAg() {
Modified: trunk/examples/cleaning-robots/MarsEnv.java
===================================================================
--- trunk/examples/cleaning-robots/MarsEnv.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/examples/cleaning-robots/MarsEnv.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -37,6 +37,7 @@
@Override
public boolean executeAction(String ag, Structure action) {
+ logger.info(ag+" doing: "+ action);
try {
if (action.equals(ns)) {
model.nextSlot();
Modified: trunk/examples/food-simulation/FoodSimulation.mas2j
===================================================================
--- trunk/examples/food-simulation/FoodSimulation.mas2j 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/examples/food-simulation/FoodSimulation.mas2j 2008-08-19 09:19:09 UTC (rev 1356)
@@ -53,6 +53,8 @@
MAS normative_simulation {
+ infrastructure: Centralised
+
// the class that implements the environment is FoodEnvironment
// parameters are: grid size, number of agents, number of food units
environment: FoodEnvironment(10,50,25)
Modified: trunk/examples/food-simulation/src/java/FoodEnvironment.java
===================================================================
--- trunk/examples/food-simulation/src/java/FoodEnvironment.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/examples/food-simulation/src/java/FoodEnvironment.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -165,7 +165,7 @@
if (name != null) {
updateAgPercept(name, ag);
} else {
- logger.warning("Can not give perception to "+ag+" bacause it is no registered!");
+ logger.warning("Can not give perception to "+ag+" because it is no registered!");
}
}
Modified: trunk/src/jason/asSyntax/NumberTermImpl.java
===================================================================
--- trunk/src/jason/asSyntax/NumberTermImpl.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/asSyntax/NumberTermImpl.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -77,14 +77,11 @@
public boolean equals(Object o) {
if (o == this) return true;
- if (o != null && o instanceof Term && ((Term)o).isNumeric()) {
+ if (o != null && o instanceof Term && ((Term)o).isNumeric() && !((Term)o).isArithExpr()) {
NumberTerm st = (NumberTerm)o;
- if (st.isVar() || st.isArithExpr())
- return false;
- else
- try {
- return solve() == st.solve();
- } catch (Exception e) { }
+ try {
+ return solve() == st.solve();
+ } catch (Exception e) { }
}
return false;
}
Modified: trunk/src/jason/asSyntax/Pred.java
===================================================================
--- trunk/src/jason/asSyntax/Pred.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/asSyntax/Pred.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -426,7 +426,7 @@
if (ta.isVar() && !ta.isUnnamedVar()) {
// replace ta to an unnamed var
- VarTerm vt = un == null ? (VarTerm)ta : un.deref((VarTerm)ta);
+ VarTerm vt = un.deref((VarTerm)ta);
UnnamedVar uv;
if (vt.isUnnamedVar()) {
uv = (UnnamedVar)vt;
Modified: trunk/src/jason/asSyntax/Structure.java
===================================================================
--- trunk/src/jason/asSyntax/Structure.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/asSyntax/Structure.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -320,8 +320,8 @@
Term ti = getTerm(i);
if (ti.isVar() && !ti.isUnnamedVar()) {
// replace ti to an unnamed var
- VarTerm vt = un == null ? (VarTerm)ti : un.deref((VarTerm)ti);
- UnnamedVar uv = null;
+ VarTerm vt = un.deref((VarTerm)ti);
+ UnnamedVar uv;
if (vt.isUnnamedVar()) {
uv = (UnnamedVar)vt;
} else {
Modified: trunk/src/jason/asSyntax/directives/Include.java
===================================================================
--- trunk/src/jason/asSyntax/directives/Include.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/asSyntax/directives/Include.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -90,13 +90,13 @@
return f;
} else if (srcpath != null) {
for (String path: srcpath) {
- File newname = new File(path + "/" + f.toString());
- if (newname.exists()) {
- try {
+ try {
+ File newname = new File(path + "/" + f.toString());
+ if (newname.exists()) {
return newname.getCanonicalFile().toString();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
}
Modified: trunk/src/jason/infra/jade/JadeAgArch.java
===================================================================
--- trunk/src/jason/infra/jade/JadeAgArch.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/infra/jade/JadeAgArch.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -382,7 +382,7 @@
try {
Term acTerm = action.getActionTerm();
- logger.info("doing: " + acTerm);
+ logger.fine("doing: " + acTerm);
rwid++;
String rw = "id"+rwid;
Modified: trunk/src/jason/infra/saci/SaciAgArch.java
===================================================================
--- trunk/src/jason/infra/saci/SaciAgArch.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/infra/saci/SaciAgArch.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -422,7 +422,7 @@
TransitionSystem ts = userAgArch.getTS();
try {
Term acTerm = action.getActionTerm();
- logger.info("doing: " + acTerm);
+ logger.fine("doing: " + acTerm);
String rw = mboxPercept.getRW();
saci.Message m = new saci.Message("(ask :receiver environment :ontology AS-Action :content execute)");
Modified: trunk/src/jason/mas2j/MAS2JProject.java
===================================================================
--- trunk/src/jason/mas2j/MAS2JProject.java 2008-08-16 10:13:14 UTC (rev 1355)
+++ trunk/src/jason/mas2j/MAS2JProject.java 2008-08-19 09:19:09 UTC (rev 1356)
@@ -89,10 +89,6 @@
}
}
- public boolean isDefaultDirectory() {
- return projectDir.equals(".");
- }
-
public String getDirectory() {
return projectDir;
}
@@ -198,10 +194,11 @@
r.add(getDirectory());
}
for (String p: sourcepaths) {
- if (getDirectory().startsWith(".") || getDirectory().startsWith("/") || getDirectory().charAt(1) == ':') {
+ //if (getDirectory().startsWith(".") || getDirectory().startsWith("/") || getDirectory().charAt(1) == ':') {
+ if (p.startsWith(".") || p.startsWith("/") || p.charAt(1) == ':') {
r.add(p);
} else {
- r.add(getDirectory()+File.separator+p);
+ r.add(getDirectory()+"/"+p);
}
}
return r;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
