diff --git a/build.gradle b/build.gradle index 79f14951..c7c6d272 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'signing' -version '2.1-SNAPSHOT' +version '2.1' group 'org.jason-lang' sourceCompatibility = 1.7 diff --git a/doc/tutorials/hello-bdi/Makefile b/doc/tutorials/hello-bdi/Makefile index d0cc2eb2..eb668bd3 100755 --- a/doc/tutorials/hello-bdi/Makefile +++ b/doc/tutorials/hello-bdi/Makefile @@ -10,4 +10,4 @@ publish: scp index.html jomifred,jason@web.sf.net:/home/groups/j/ja/jason/htdocs/mini-tutorial/hello-bdi # scp jcm.css jomifred,jason@web.sf.net:/home/groups/j/ja/jason/htdocs/mini-tutorial/hello-bdi # scp -r screens jomifred,jason@web.sf.net:/home/groups/j/ja/jason/htdocs/mini-tutorial/hello-bdi -# scp -r code jomifred,jason@web.sf.net:/home/groups/j/ja/jason/htdocs/mini-tutorial/hello-bdi + scp -r code jomifred,jason@web.sf.net:/home/groups/j/ja/jason/htdocs/mini-tutorial/hello-bdi diff --git a/doc/tutorials/hello-bdi/code/Calendar.java b/doc/tutorials/hello-bdi/code/Calendar.java index cccbc1e0..fdb18fc4 100644 --- a/doc/tutorials/hello-bdi/code/Calendar.java +++ b/doc/tutorials/hello-bdi/code/Calendar.java @@ -59,12 +59,12 @@ void initGUI() { /* protected void linkChangeEventToOp(JSlider source, String opName){ - insertEventToOp(source,"stateChanged",opName); - source.addChangeListener((ChangeListener) getEventListenerInstance()); - } + insertEventToOp(source,"stateChanged",opName); + source.addChangeListener((ChangeListener) getEventListenerInstance()); + } */ - @INTERNAL_OPERATION void updateDay(ChangeEvent ev) { + @INTERNAL_OPERATION void updateDay(ChangeEvent ev) { try { ObsProperty prop = getObsProperty("today"); prop.updateValue(days[ (int)s.getValue() ]); diff --git a/doc/tutorials/hello-bdi/code/bob.asl b/doc/tutorials/hello-bdi/code/bob.asl index ec1c0b83..b9bc372f 100644 --- a/doc/tutorials/hello-bdi/code/bob.asl +++ b/doc/tutorials/hello-bdi/code/bob.asl @@ -12,7 +12,7 @@ sincere(alice). +!say(X) : today(friday) <- .print(X,"!!!!!"); .wait(500); !say(X). +!say(X) : not today(monday) <- .print(X); .wait(math.random(400)+100); !say(X). -+!say(X) <- !say(X). ++!say(X) <- !say(X). +today(wednesday) <- .print("**** Let's slow down.... **** (only 2 intentions)"); !enter_lazy_mode. +today(friday) <- .print("**** Let's finish the work!"); !resume_all. diff --git a/release-notes.adoc b/release-notes.adoc index eb68b7e4..25e02e23 100644 --- a/release-notes.adoc +++ b/release-notes.adoc @@ -3,8 +3,16 @@ ifdef::env-github[:outfilesuffix: .adoc] +== version 2.1 + +(build package available at https://sourceforge.net/projects/jason/files/jason/version%202.1/[here]) + +- this release just fixes some bugs + == version 2.0 +(build package available at https://sourceforge.net/projects/jason/files/jason/version%202.0/[here]) + *New features* - modules and namespaces, see link:doc/tech/modules-namespaces.pdf[] diff --git a/src/main/java/jason/infra/centralised/RunCentralisedMAS.java b/src/main/java/jason/infra/centralised/RunCentralisedMAS.java index 339f862a..3ce35daf 100644 --- a/src/main/java/jason/infra/centralised/RunCentralisedMAS.java +++ b/src/main/java/jason/infra/centralised/RunCentralisedMAS.java @@ -621,9 +621,9 @@ private void createThreadPool() { if (ag.getCyclesAct() == -1) ag.setCyclesAct(cyclesAct); if (executor != null) { - executor.execute(ag); if (ag instanceof CentralisedAgArchForPool) ((CentralisedAgArchForPool)ag).setExecutor(executor); + executor.execute(ag); } else if (ag instanceof CentralisedAgArchAsynchronous) { CentralisedAgArchAsynchronous ag2 = (CentralisedAgArchAsynchronous) ag;