Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1684] trunk
|
From: <jom...@us...> - 2012-04-15 14:09:59
|
Revision: 1684
http://jason.svn.sourceforge.net/jason/?rev=1684&view=rev
Author: jomifred
Date: 2012-04-15 14:09:52 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
remove saci
Modified Paths:
--------------
trunk/build.xml
trunk/doc/faq/faq.tex
trunk/examples/sniffer/Sniffer.mas2j
trunk/release-notes.txt
trunk/src/jason/jeditplugin/Config.java
trunk/src/jason/util/ConfigGUI.java
Removed Paths:
-------------
trunk/demos/create-agent/CreateAgDemo.java
trunk/examples/sniffer/comm/SnifferSaci.java
trunk/lib/saci.jar
trunk/src/jason/infra/saci/
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/build.xml 2012-04-15 14:09:52 UTC (rev 1684)
@@ -4,7 +4,6 @@
<property environment="env" />
- <property name="saciJar" value="${basedir}/lib/saci.jar" />
<property name="jasonJar" value="${basedir}/lib/jason.jar" />
<property name="jadeJar" value="${basedir}/lib/jade.jar" />
<property name="jasonSJar" value="${basedir}/lib/s-jason.jar" />
@@ -13,7 +12,7 @@
<property name="dist.properties" value="${basedir}/bin/dist.properties" />
<property name="version" value="1" />
- <property name="release" value="3.6b" />
+ <property name="release" value="3.7" />
<property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
<property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
@@ -36,7 +35,6 @@
<path id="run.classpath">
<pathelement location="${jedit.install.dir}/jedit.jar" />
- <pathelement location="${saciJar}" />
<pathelement location="${jadeJar}" />
</path>
@@ -408,7 +406,6 @@
<fileset dir="${basedir}" includes="bin/*.old" />
<fileset dir="${basedir}" includes="**/.err" />
<fileset dir="${basedir}" includes="bookstore.*" />
- <fileset dir="${basedir}/lib/saci/bin" includes="work" />
</delete>
<delete dir="${build.dir}" />
</target>
Deleted: trunk/demos/create-agent/CreateAgDemo.java
===================================================================
--- trunk/demos/create-agent/CreateAgDemo.java 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/demos/create-agent/CreateAgDemo.java 2012-04-15 14:09:52 UTC (rev 1684)
@@ -1,22 +0,0 @@
-import jason.infra.saci.*;
-
-/**
- * This program creates a new agent for SACI infrastructure. This new agent is
- * named "anotherAg" and enters in a MAS called "createAgDemo" that must be
- * already running.
- */
-public class CreateAgDemo {
- public static void main(String[] args) throws Exception {
- // gets a reference to Saci runtime services and
- // calls createAg method. "createAgDemo" is the MAS Id
- // set in the .mas2j project.
-
- new SaciRuntimeServices("createAgDemo").createAgent(
- "anotherAg", // agent name
- "ag1.asl", // AgentSpeak source
- null, // default agent class
- null, // default architecture class
- null, // default belief base
- null); // default settings
- }
-}
Modified: trunk/doc/faq/faq.tex
===================================================================
--- trunk/doc/faq/faq.tex 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/doc/faq/faq.tex 2012-04-15 14:09:52 UTC (rev 1684)
@@ -8,7 +8,6 @@
\usepackage{xspace}
\newcommand{\jason}[0]{\htlink{\textit{Jason}}{http://jason.sf.net}\xspace}
-\newcommand{\saci}[0]{\htlink{\textsc{Saci}}{http://www.lti.pcs.usp.br/saci}\xspace}
\newcommand{\jade}[0]{\htlink{\textsc{Jade}}{http://jade.tilab.com/}\xspace}
\newcommand{\code}[1]{\texttt{#1}}
@@ -17,7 +16,7 @@
\html{\begin{rawhtml}<h0><b><i>Jason</i></b> FAQ
- <br><font size="-1">(for version 1.3.6)</font></h0>
+ <br><font size="-1">(for version 1.3.7)</font></h0>
\end{rawhtml}}
\latex{\begin{center}{\Huge\jason FAQ}\end{center}}
@@ -273,14 +272,14 @@
The
\htlink{RuntimeServices}{http://jason.sourceforge.net/api/jason/runtime/RuntimeServicesInfraTier.html}
interface, used in the code above, provides useful services
-transparently from the underlying infrastructure (Centralised, Saci,
+transparently from the underlying infrastructure (Centralised, Jade,
...). The interface's methods include agent creation, agent killing,
and halting the system (see the API documentation for more
information).
-Note that if you're using the \saci infrastructure, new
-agents (possibly not \jason agents, see \ref{sec:whysaci}) can
-enter the MAS using \saci features for open MAS.
+Note that if you're using the \jade infrastructure, new
+agents (possibly not \jason agents, see \ref{sec:whyjade}) can
+enter the MAS using \jade features for open MAS.
\subsection{How to set the classpath for running a system?}
@@ -379,7 +378,7 @@
"Jason controller" with a GUI for debugging. This graphical tool is
called "\jason's Mind Inspector", as it allows users to observe all
changes in agents' mental attitudes after a (number of) reasoning
- cycle(s). This also applies to distributed agents (using \saci).
+ cycle(s). This also applies to distributed agents (using \jade).
\end{itemize}
@@ -631,7 +630,7 @@
An infrastructure provides the following services for the MAS:
\begin{itemize}
-\item communication (e.g., the \saci infrastructure implements
+\item communication (e.g., the centralised infrastructure implements
communication based on KQML whilst \jade implements it using
FIPA-ACL),
\item control of the agent life cycle (creation, running,
@@ -647,13 +646,6 @@
that can be executed in a single computer. It is also useful to test
and develop (prototype) systems. Centralised is the default infrastructure.
-\item[Saci:] provides distribution and communication based on KQML;
- click
-\begin{rawhtml}
- <a href="http://www.lti.pcs.usp.br/saci">here</a>
-\end{rawhtml}
- for more details.
-
\item[Jade:] provides distribution and communication using
\begin{rawhtml}
<a href="http://jade.tilab.com/">Jade</a>,
@@ -694,13 +686,6 @@
agents: ag1; ag2; ag3;
}
\end{verbatim}
-to use Saci:
-\begin{verbatim}
-MAS auction {
- infrastructure: Saci
- agents: ag1; ag2; ag3;
-}
-\end{verbatim}
and to use Jade:
\begin{verbatim}
MAS auction {
@@ -713,7 +698,7 @@
infrastructures. The \jason Agent Architecture binds them to the
available infrastructure.
-\subsection{When should I use the \saci or \jade infrastructures?}\label{sec:whysaci}
+\subsection{When should I use the \jade infrastructures?}\label{sec:whyjade}
The centralised infrastructure does not support:
\begin{itemize}
@@ -721,15 +706,11 @@
\item interoperability with non-\jason agents.
\end{itemize}
-If you need any of these features, you should choose the \saci or
-\jade infrastructures (or implement/plug a new infrastructure for/into
+If you need any of these features, you should choose the \jade
+infrastructure (or implement/plug a new infrastructure for/into
\jason yourself). The interoperability with non-\jason agents is
-achieved by \saci through KQML communication. An example of
-communication between \jason and \saci agents (implemented in Java) is
-available at \htlink{Source
- Force}{https://sourceforge.net/project/showfiles.php?group_id=98417}.
+achieved by \jade through FIPA-ACL communication.
-
\section{\jade}
\subsection{How to customise the \jade container?}
Modified: trunk/examples/sniffer/Sniffer.mas2j
===================================================================
--- trunk/examples/sniffer/Sniffer.mas2j 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/examples/sniffer/Sniffer.mas2j 2012-04-15 14:09:52 UTC (rev 1684)
@@ -25,13 +25,10 @@
"", // password
"[msgSent(7,log)]");
- // Monitor for SACI
- //monitor agentArchClass comm.SnifferSaci;
-
// Ordinary agents
bob;
maria;
- classpath: "../../lib/saci.jar"; "../../demos/persistent-belief-base/lib/hsqldb.jar";
+ classpath: "../../demos/persistent-belief-base/lib/hsqldb.jar";
}
Deleted: trunk/examples/sniffer/comm/SnifferSaci.java
===================================================================
--- trunk/examples/sniffer/comm/SnifferSaci.java 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/examples/sniffer/comm/SnifferSaci.java 2012-04-15 14:09:52 UTC (rev 1684)
@@ -1,55 +0,0 @@
-package comm;
-
-import jason.architecture.AgArch;
-import jason.infra.saci.SaciAgArch;
-
-import java.rmi.RemoteException;
-
-/**
- * Customisation of an agent architecture to sniff the MAS with
- * SACI infrastructure.
- *
- * @author Jomi
- */
-public class SnifferSaci extends AgArch {
-
- SaciAgArch arch = null;
-
- @Override
- public void init() {
- // becomes a SACI monitor if infrastructure is Saci
- if (getArchInfraTier() instanceof SaciAgArch) {
- arch = (SaciAgArch)getArchInfraTier();
- try {
- arch.getMBox().setIAmMonitor(true); // i do not need to notify myself
-
- // subscribes saci-events for its society
- // (if you want to monitor only one agent, send this message only to it)
- arch.getMBox().sendMsg(new saci.Message("(subscribe :ontology saci-events :receiver Facilitator)"));
-
- } catch (Exception e) {
- getTS().getLogger().warning("Error starting monitor! "+e);
- }
- }
- }
-
- @Override
- public void checkMail() {
- if (arch != null) {
- // remove all messages from saci's mail box
- try {
- saci.Message m = arch.getMBox().receive();
- while (m != null) {
- if (m.getOntology().equals("saci-events")) {
- // print the sniff message in the console
- getTS().getLogger().info("Message:"+m);
- }
- m = arch.getMBox().receive();
- }
- } catch (RemoteException e) {
- getTS().getLogger().warning("Error reading messages! "+e);
- }
- }
- }
-
-}
Deleted: trunk/lib/saci.jar
===================================================================
(Binary files differ)
Modified: trunk/release-notes.txt
===================================================================
--- trunk/release-notes.txt 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/release-notes.txt 2012-04-15 14:09:52 UTC (rev 1684)
@@ -1,15 +1,20 @@
---------------------------
-version XXX
+version 1.3.7
revision YYY on SVN
---------------------------
New features
- Initial implementation of Cycled Terms
+- JaCaMo infrastructure (in beta)
Bugs fixed
- the expression "1 - 1 - 1" is evaluated as 1 instead of -1
+Other changes
+- support for SACI is removed, users that still use this platform
+ should not upgrade to this version
+
---------------------------
version 1.3.6a
Modified: trunk/src/jason/jeditplugin/Config.java
===================================================================
--- trunk/src/jason/jeditplugin/Config.java 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/src/jason/jeditplugin/Config.java 2012-04-15 14:09:52 UTC (rev 1684)
@@ -26,7 +26,6 @@
import jason.asSemantics.TransitionSystem;
import jason.infra.centralised.CentralisedFactory;
import jason.infra.jade.JadeFactory;
-import jason.infra.saci.SaciFactory;
import java.io.BufferedReader;
import java.io.File;
@@ -51,9 +50,6 @@
/** path to jason.jar */
public static final String JASON_JAR = "jasonJar";
- /** path to saci.jar */
- public static final String SACI_JAR = "saciJar";
-
/** path to ant home (jar directory) */
public static final String ANT_LIB = "antLib";
@@ -142,11 +138,6 @@
return "";
}
- /** Returns the full path to the saci.jar file */
- public String getSaciJar() {
- return getProperty(SACI_JAR);
- }
-
/** Returns the full path to the jade.jar file */
public String getJadeJar() {
return getProperty(JADE_JAR);
@@ -210,7 +201,6 @@
/** Set most important parameters with default values */
public void fix() {
tryToFixJarFileConf(JASON_JAR, "jason.jar", 700000);
- tryToFixJarFileConf(SACI_JAR, "saci.jar", 300000);
tryToFixJarFileConf(JADE_JAR, "jade.jar", 2000000);
tryToFixJarFileConf(MOISE_JAR, "moise.jar", 300000);
tryToFixJarFileConf(JACAMO_JAR, "jacamo.jar", 10000);
@@ -280,7 +270,6 @@
// Default infrastructures
put("infrastructure.Centralised", CentralisedFactory.class.getName());
- put("infrastructure.Saci", SaciFactory.class.getName());
put("infrastructure.Jade", JadeFactory.class.getName());
put("infrastructure.JaCaMo", "jacamo.infra.JaCaMoInfrastructureFactory");
@@ -325,7 +314,7 @@
} catch (Exception e) {
System.err.println("Error getting user infrastructures.");
}
- return new String[] {"Centralised","Jade","Saci"};
+ return new String[] {"Centralised","Jade","JaCaMo"};
}
public String getInfrastructureFactoryClass(String infraId) {
Modified: trunk/src/jason/util/ConfigGUI.java
===================================================================
--- trunk/src/jason/util/ConfigGUI.java 2012-04-14 16:14:07 UTC (rev 1683)
+++ trunk/src/jason/util/ConfigGUI.java 2012-04-15 14:09:52 UTC (rev 1684)
@@ -62,7 +62,6 @@
protected JCheckBox checkVersionCBox;
protected JCheckBox warnSingVarsCBox;
- //protected JTextField saciTF;
protected JTextField jadeJarTF;
protected JTextField jadeArgsTF;
protected JCheckBox jadeSnifferCB;
@@ -81,7 +80,6 @@
// new version, set all values to default
System.out.println("This is a new version of Jason, reseting configuration...");
//userProperties.clear();
- userProperties.remove(Config.SACI_JAR);
userProperties.remove(Config.JADE_JAR);
userProperties.remove(Config.JASON_JAR);
userProperties.remove(Config.ANT_LIB);
@@ -266,19 +264,6 @@
pop.add(jadeHomePanel);
- // saci home
- /*
- JPanel saciHomePanel = new JPanel();
- saciHomePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory
- .createEtchedBorder(), "Saci", TitledBorder.LEFT, TitledBorder.TOP));
- saciHomePanel.setLayout(new FlowLayout(FlowLayout.LEFT));
- saciHomePanel.add(new JLabel("saci.jar location"));
- saciTF = new JTextField(25);
- saciHomePanel.add(saciTF);
- saciHomePanel.add(createBrowseButton("saci.jar", saciTF));
- pop.add(saciHomePanel);
- */
-
// shell command
/*
JPanel shellPanel = new JPanel();
@@ -309,7 +294,6 @@
closeAllPanel.add(closeAllCBox);
pop.add(closeAllPanel);
- //saciTF.setText(userProperties.getSaciJar());
jadeJarTF.setText(userProperties.getJadeJar());
jadeArgsTF.setText(userProperties.getJadeArgs());
jasonTF.setText(userProperties.getJasonJar());
@@ -354,10 +338,6 @@
}
public void save() {
- //if (Config.checkJar(saciTF.getText())) {
- // userProperties.put(Config.SACI_JAR, saciTF.getText().trim());
- //}
-
if (Config.checkJar(jadeJarTF.getText())) {
userProperties.put(Config.JADE_JAR, jadeJarTF.getText().trim());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
