Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1386] trunk
|
From: <jom...@us...> - 2008-09-29 08:39:22
|
Revision: 1386
http://jason.svn.sourceforge.net/jason/?rev=1386&view=rev
Author: jomifred
Date: 2008-09-29 08:38:52 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
replace all tabs for 4 spaces in sources
Modified Paths:
--------------
trunk/build.xml
trunk/src/jason/JasonException.java
trunk/src/jason/ReceiverNotFoundException.java
trunk/src/jason/architecture/AgArch.java
trunk/src/jason/asSemantics/ActionExec.java
trunk/src/jason/asSemantics/Agent.java
trunk/src/jason/asSemantics/Circumstance.java
trunk/src/jason/asSemantics/CircumstanceListener.java
trunk/src/jason/asSemantics/Event.java
trunk/src/jason/asSemantics/IntendedMeans.java
trunk/src/jason/asSemantics/Intention.java
trunk/src/jason/asSemantics/Message.java
trunk/src/jason/asSemantics/Option.java
trunk/src/jason/asSemantics/TransitionSystem.java
trunk/src/jason/asSemantics/Unifier.java
trunk/src/jason/asSyntax/ArithFunctionTerm.java
trunk/src/jason/asSyntax/Atom.java
trunk/src/jason/asSyntax/BinaryStructure.java
trunk/src/jason/asSyntax/DefaultTerm.java
trunk/src/jason/asSyntax/ListTerm.java
trunk/src/jason/asSyntax/ListTermImpl.java
trunk/src/jason/asSyntax/Literal.java
trunk/src/jason/asSyntax/LiteralImpl.java
trunk/src/jason/asSyntax/LogExpr.java
trunk/src/jason/asSyntax/NumberTermImpl.java
trunk/src/jason/asSyntax/ObjectTermImpl.java
trunk/src/jason/asSyntax/PlanBodyImpl.java
trunk/src/jason/asSyntax/PlanLibrary.java
trunk/src/jason/asSyntax/Pred.java
trunk/src/jason/asSyntax/RelExpr.java
trunk/src/jason/asSyntax/SourceInfo.java
trunk/src/jason/asSyntax/StringTerm.java
trunk/src/jason/asSyntax/StringTermImpl.java
trunk/src/jason/asSyntax/Structure.java
trunk/src/jason/asSyntax/Trigger.java
trunk/src/jason/asSyntax/UnnamedVar.java
trunk/src/jason/asSyntax/VarTerm.java
trunk/src/jason/asSyntax/directives/FunctionRegister.java
trunk/src/jason/asSyntax/directives/Include.java
trunk/src/jason/asSyntax/patterns/goal/BDG.java
trunk/src/jason/asSyntax/patterns/goal/EBDG.java
trunk/src/jason/asSyntax/patterns/goal/MG.java
trunk/src/jason/asSyntax/patterns/goal/RC.java
trunk/src/jason/asSyntax/patterns/goal/SMC.java
trunk/src/jason/bb/DefaultBeliefBase.java
trunk/src/jason/bb/IndexedBB.java
trunk/src/jason/control/ExecutionControl.java
trunk/src/jason/control/ExecutionControlGUI.java
trunk/src/jason/control/ExecutionControlInfraTier.java
trunk/src/jason/environment/Environment.java
trunk/src/jason/environment/SteppedEnvironment.java
trunk/src/jason/environment/grid/GridWorldModel.java
trunk/src/jason/environment/grid/GridWorldView.java
trunk/src/jason/environment/grid/Location.java
trunk/src/jason/functions/Abs.java
trunk/src/jason/functions/Average.java
trunk/src/jason/functions/Count.java
trunk/src/jason/functions/Length.java
trunk/src/jason/functions/Max.java
trunk/src/jason/functions/Min.java
trunk/src/jason/functions/Random.java
trunk/src/jason/functions/Round.java
trunk/src/jason/functions/RuleToFunction.java
trunk/src/jason/functions/Sqrt.java
trunk/src/jason/functions/Sum.java
trunk/src/jason/functions/ceil.java
trunk/src/jason/functions/e.java
trunk/src/jason/functions/floor.java
trunk/src/jason/functions/log.java
trunk/src/jason/functions/pi.java
trunk/src/jason/functions/time.java
trunk/src/jason/infra/InfrastructureFactory.java
trunk/src/jason/infra/centralised/BaseDialogGUI.java
trunk/src/jason/infra/centralised/CentralisedAgArch.java
trunk/src/jason/infra/centralised/CentralisedEnvironment.java
trunk/src/jason/infra/centralised/CentralisedExecutionControl.java
trunk/src/jason/infra/centralised/CentralisedFactory.java
trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java
trunk/src/jason/infra/centralised/CentralisedRuntimeServices.java
trunk/src/jason/infra/centralised/CreateJNLP.java
trunk/src/jason/infra/centralised/KillAgentGUI.java
trunk/src/jason/infra/centralised/RunCentralisedMAS.java
trunk/src/jason/infra/centralised/StartNewAgentGUI.java
trunk/src/jason/infra/jade/JadeAg.java
trunk/src/jason/infra/jade/JadeAgArch.java
trunk/src/jason/infra/jade/JadeExecutionControl.java
trunk/src/jason/infra/jade/JadeFactory.java
trunk/src/jason/infra/jade/RunJadeMAS.java
trunk/src/jason/infra/saci/SaciAgArch.java
trunk/src/jason/infra/saci/SaciEnvironment.java
trunk/src/jason/infra/saci/SaciExecutionControl.java
trunk/src/jason/infra/saci/SaciFactory.java
trunk/src/jason/infra/saci/StartSaci.java
trunk/src/jason/jeditplugin/AboutGUI.java
trunk/src/jason/jeditplugin/AgentSpeakSideKickParser.java
trunk/src/jason/jeditplugin/CheckVersion.java
trunk/src/jason/jeditplugin/Config.java
trunk/src/jason/jeditplugin/JasonID.java
trunk/src/jason/jeditplugin/JasonIDOptionPanel.java
trunk/src/jason/jeditplugin/JasonIDPlugin.java
trunk/src/jason/jeditplugin/JasonProjectImporter.java
trunk/src/jason/jeditplugin/JasonProjectSideKickParser.java
trunk/src/jason/jeditplugin/MASLauncherInfraTier.java
trunk/src/jason/jeditplugin/NewAgentGUI.java
trunk/src/jason/jeditplugin/NewEnvironmentGUI.java
trunk/src/jason/jeditplugin/NewInternalActionGUI.java
trunk/src/jason/jeditplugin/NewProjectGUI.java
trunk/src/jason/jeditplugin/RunProjectListener.java
trunk/src/jason/mas2j/AgentParameters.java
trunk/src/jason/mas2j/MAS2JProject.java
trunk/src/jason/runtime/MASConsoleGUI.java
trunk/src/jason/runtime/MASConsoleLogFormatter.java
trunk/src/jason/runtime/MASConsoleLogHandler.java
trunk/src/jason/runtime/OutputStreamAdapter.java
trunk/src/jason/runtime/Settings.java
trunk/src/jason/stdlib/add_annot.java
trunk/src/jason/stdlib/add_nested_source.java
trunk/src/jason/stdlib/at.java
trunk/src/jason/stdlib/atom.java
trunk/src/jason/stdlib/broadcast.java
trunk/src/jason/stdlib/concat.java
trunk/src/jason/stdlib/create_agent.java
trunk/src/jason/stdlib/date.java
trunk/src/jason/stdlib/delete.java
trunk/src/jason/stdlib/difference.java
trunk/src/jason/stdlib/dropGoal.java
trunk/src/jason/stdlib/drop_desire.java
trunk/src/jason/stdlib/fail.java
trunk/src/jason/stdlib/foreach.java
trunk/src/jason/stdlib/ground.java
trunk/src/jason/stdlib/if_then_else.java
trunk/src/jason/stdlib/intend.java
trunk/src/jason/stdlib/intersection.java
trunk/src/jason/stdlib/length.java
trunk/src/jason/stdlib/list.java
trunk/src/jason/stdlib/literal.java
trunk/src/jason/stdlib/loop.java
trunk/src/jason/stdlib/max.java
trunk/src/jason/stdlib/member.java
trunk/src/jason/stdlib/min.java
trunk/src/jason/stdlib/nth.java
trunk/src/jason/stdlib/number.java
trunk/src/jason/stdlib/print.java
trunk/src/jason/stdlib/println.java
trunk/src/jason/stdlib/random.java
trunk/src/jason/stdlib/range.java
trunk/src/jason/stdlib/resume.java
trunk/src/jason/stdlib/reverse.java
trunk/src/jason/stdlib/sort.java
trunk/src/jason/stdlib/string.java
trunk/src/jason/stdlib/structure.java
trunk/src/jason/stdlib/substring.java
trunk/src/jason/stdlib/succeed_goal.java
trunk/src/jason/stdlib/suspend.java
trunk/src/jason/stdlib/term2string.java
trunk/src/jason/stdlib/time.java
trunk/src/jason/stdlib/union.java
trunk/src/jason/stdlib/wait.java
trunk/src/jason/util/asl2html.java
trunk/src/jason/util/asl2tex.java
trunk/src/jason/util/asl2xml.java
trunk/src/test/BeliefBaseTest.java
trunk/src/test/ExprTermTest.java
trunk/src/test/ListTermTest.java
trunk/src/test/MAS2JParserTest.java
trunk/src/test/PlanTest.java
trunk/src/test/RuleTest.java
trunk/src/test/StdLibTest.java
trunk/src/test/StringTermTest.java
trunk/src/test/TermTest.java
trunk/src/test/VarTermTest.java
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/build.xml 2008-09-29 08:38:52 UTC (rev 1386)
@@ -2,389 +2,391 @@
<project basedir="." default="run" name="Jason">
- <property environment="env" />
+ <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="jadeHttpJar" value="${basedir}/lib/http.jar" />
- <property name="jadeToolsJar" value="${basedir}/lib/jadeTools.jar" />
- <property name="jasonSJar" value="${basedir}/lib/s-jason.jar" />
+ <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="jadeHttpJar" value="${basedir}/lib/http.jar" />
+ <property name="jadeToolsJar" value="${basedir}/lib/jadeTools.jar" />
+ <property name="jasonSJar" value="${basedir}/lib/s-jason.jar" />
- <property name="build.dir" value="${basedir}/bin/classes" />
+ <property name="build.dir" value="${basedir}/bin/classes" />
- <property name="dist.properties" value="${basedir}/bin/dist.properties" />
- <property name="version" value="1" />
- <property name="release" value="2.0" />
- <property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
- <property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
+ <property name="dist.properties" value="${basedir}/bin/dist.properties" />
+ <property name="version" value="1" />
+ <property name="release" value="2.0" />
+ <property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
+ <property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
- <property name="jedit.install.dir" value="${basedir}/bin/jedit" />
- <property name="plugin.jar.name" value="jason-jedit-plugin.jar" />
+ <property name="jedit.install.dir" value="${basedir}/bin/jedit" />
+ <property name="plugin.jar.name" value="jason-jedit-plugin.jar" />
- <path id="run.classpath">
- <pathelement location="${jedit.install.dir}/jedit.jar" />
- <pathelement location="${saciJar}" />
- <pathelement location="${jadeJar}" />
- <pathelement location="${jadeHttpJar}" />
- <pathelement location="${jadeToolsJar}" />
- </path>
+ <path id="run.classpath">
+ <pathelement location="${jedit.install.dir}/jedit.jar" />
+ <pathelement location="${saciJar}" />
+ <pathelement location="${jadeJar}" />
+ <pathelement location="${jadeHttpJar}" />
+ <pathelement location="${jadeToolsJar}" />
+ </path>
- <path id="project.classpath">
- <path refid="run.classpath" />
- <pathelement location="${basedir}/lib/junit.jar" />
- <pathelement location="${basedir}/lib/ant-launcher.jar" />
- <pathelement location="${basedir}/lib/ant.jar" />
- <pathelement location="${basedir}/demos/persistent-belief-base/lib/hsqldb.jar" />
- <pathelement location="${basedir}/lib/jedit/ErrorList.jar" />
- <pathelement location="${basedir}/lib/jedit/SideKick.jar" />
- <pathelement location="${jasonJar}" />
- </path>
+ <path id="project.classpath">
+ <path refid="run.classpath" />
+ <pathelement location="${basedir}/lib/junit.jar" />
+ <pathelement location="${basedir}/lib/ant-launcher.jar" />
+ <pathelement location="${basedir}/lib/ant.jar" />
+ <pathelement location="${basedir}/demos/persistent-belief-base/lib/hsqldb.jar" />
+ <pathelement location="${basedir}/lib/jedit/ErrorList.jar" />
+ <pathelement location="${basedir}/lib/jedit/SideKick.jar" />
+ <pathelement location="${jasonJar}" />
+ </path>
- <path id="test.classpath">
- <path refid="project.classpath" />
- <pathelement location="${build.dir}" />
- </path>
+ <path id="test.classpath">
+ <path refid="project.classpath" />
+ <pathelement location="${build.dir}" />
+ </path>
- <condition property="jedit-ok" value="ok">
- <or>
- <not>
- <available file="${basedir}/bin/jedit.tgz" />
- </not>
- <uptodate targetfile="${jedit.install.dir}" srcfile="${basedir}/bin/jedit.tgz" />
- </or>
- </condition>
+ <condition property="jedit-ok" value="ok">
+ <or>
+ <not>
+ <available file="${basedir}/bin/jedit.tgz" />
+ </not>
+ <uptodate targetfile="${jedit.install.dir}" srcfile="${basedir}/bin/jedit.tgz" />
+ </or>
+ </condition>
- <target name="untar-jedit" unless="jedit-ok">
- <echo message="Uncompressing jEdit" />
- <delete dir="${jedit.install.dir}" />
- <untar compression="gzip" dest="${basedir}/bin" src="${basedir}/bin/jedit.tgz" />
- </target>
+ <target name="untar-jedit" unless="jedit-ok">
+ <echo message="Uncompressing jEdit" />
+ <delete dir="${jedit.install.dir}" />
+ <untar compression="gzip" dest="${basedir}/bin" src="${basedir}/bin/jedit.tgz" />
+ </target>
- <target name="init" depends="untar-jedit">
- <mkdir dir="${build.dir}" />
- </target>
+ <target name="init" depends="untar-jedit">
+ <mkdir dir="${build.dir}" />
+ </target>
-
- <condition property="parsers-ok" value="ok">
- <and>
- <uptodate property="parsers-ok" targetfile="${basedir}/src/jason/mas2j/parser/mas2j.java" srcfile="${basedir}/src/jason/mas2j/parser/MAS2JavaParser.jcc" />
- <uptodate property="parsers-ok" targetfile="${basedir}/src/jason/asSyntax/parser/as2j.java" srcfile="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.jcc" />
- <uptodate property="parsers-ok" targetfile="${basedir}/doc/AS2JavaParser.html" srcfile="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.jcc" />
- </and>
- </condition>
+
+ <condition property="parsers-ok" value="ok">
+ <and>
+ <uptodate property="parsers-ok" targetfile="${basedir}/src/jason/mas2j/parser/mas2j.java" srcfile="${basedir}/src/jason/mas2j/parser/MAS2JavaParser.jcc" />
+ <uptodate property="parsers-ok" targetfile="${basedir}/src/jason/asSyntax/parser/as2j.java" srcfile="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.jcc" />
+ <uptodate property="parsers-ok" targetfile="${basedir}/doc/AS2JavaParser.html" srcfile="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.jcc" />
+ </and>
+ </condition>
- <target name="parsers" depends="init" unless="parsers-ok">
- <delete failonerror="no">
- <fileset dir="${basedir}/src/jason/mas2j/parser" includes="*.java" />
- <fileset dir="${basedir}/src/jason/asSyntax/parser" includes="*.java" />
- </delete>
+ <target name="parsers" depends="init" unless="parsers-ok">
+ <delete failonerror="no">
+ <fileset dir="${basedir}/src/jason/mas2j/parser" includes="*.java" />
+ <fileset dir="${basedir}/src/jason/asSyntax/parser" includes="*.java" />
+ </delete>
- <java dir="${basedir}/src/jason/mas2j/parser" classname="javacc" fork="yes">
- <classpath location="${basedir}/lib/javacc.jar" />
- <arg line="MAS2JavaParser.jcc" />
- </java>
+ <java dir="${basedir}/src/jason/mas2j/parser" classname="javacc" fork="yes">
+ <classpath location="${basedir}/lib/javacc.jar" />
+ <arg line="MAS2JavaParser.jcc" />
+ </java>
- <java dir="${basedir}/src/jason/asSyntax/parser" classname="javacc" fork="yes">
- <classpath location="${basedir}/lib/javacc.jar" />
- <arg line="AS2JavaParser.jcc" />
- </java>
+ <java dir="${basedir}/src/jason/asSyntax/parser" classname="javacc" fork="yes">
+ <classpath location="${basedir}/lib/javacc.jar" />
+ <arg line="AS2JavaParser.jcc" />
+ </java>
- <java dir="${basedir}/src/jason/mas2j/parser" classname="jjdoc" fork="yes">
- <classpath location="${basedir}/lib/javacc.jar" />
- <arg line="MAS2JavaParser.jcc" />
- </java>
- <move file="${basedir}/src/jason/mas2j/parser/MAS2JavaParser.html" todir="${basedir}/doc" />
+ <java dir="${basedir}/src/jason/mas2j/parser" classname="jjdoc" fork="yes">
+ <classpath location="${basedir}/lib/javacc.jar" />
+ <arg line="MAS2JavaParser.jcc" />
+ </java>
+ <move file="${basedir}/src/jason/mas2j/parser/MAS2JavaParser.html" todir="${basedir}/doc" />
- <java dir="${basedir}/src/jason/asSyntax/parser" classname="jjdoc" fork="yes">
- <classpath location="${basedir}/lib/javacc.jar" />
- <arg line="AS2JavaParser.jcc" />
- </java>
- <move file="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.html" todir="${basedir}/doc" />
+ <java dir="${basedir}/src/jason/asSyntax/parser" classname="jjdoc" fork="yes">
+ <classpath location="${basedir}/lib/javacc.jar" />
+ <arg line="AS2JavaParser.jcc" />
+ </java>
+ <move file="${basedir}/src/jason/asSyntax/parser/AS2JavaParser.html" todir="${basedir}/doc" />
- </target>
+ </target>
- <target name="compile" depends="init,parsers">
- <javac srcdir="src" destdir="${build.dir}" debug="true" deprecation="true" optimize="true" nowarn="true" source="1.5" target="1.5">
- <classpath refid="project.classpath" />
- </javac>
- </target>
+ <target name="compile" depends="init,parsers">
+ <javac srcdir="src" destdir="${build.dir}" debug="true" deprecation="true" optimize="true" nowarn="true" source="1.5" target="1.5">
+ <classpath refid="project.classpath" />
+ </javac>
+ </target>
- <target name="jar" depends="compile">
- <jar jarfile="${jasonJar}" >
- <fileset dir="${build.dir}">
- <include name="jason/**/*.class" />
- <exclude name="jason/jeditplugin/**/*.class" />
- </fileset>
- <fileset dir="${build.dir}">
- <include name="jason/jeditplugin/Config.class" />
- <include name="jason/jeditplugin/MASLauncherInfraTier*" />
- </fileset>
- <fileset dir="${basedir}/src">
- <include name="images/**/*" />
- <include name="asl/**/*" />
- <include name="xml/**/*" />
- <include name="templates/**/*" />
- <include name="logging.properties" />
- </fileset>
- <fileset dir="${basedir}/bin">
- <include name="dist.properties" />
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="jason.infra.centralised.RunCentralisedMAS"/>
+ <target name="jar" depends="compile">
+ <jar jarfile="${jasonJar}" >
+ <fileset dir="${build.dir}">
+ <include name="jason/**/*.class" />
+ <exclude name="jason/jeditplugin/**/*.class" />
+ </fileset>
+ <fileset dir="${build.dir}">
+ <include name="jason/jeditplugin/Config.class" />
+ <include name="jason/jeditplugin/MASLauncherInfraTier*" />
+ </fileset>
+ <fileset dir="${basedir}/src">
+ <include name="images/**/*" />
+ <include name="asl/**/*" />
+ <include name="xml/**/*" />
+ <include name="templates/**/*" />
+ <include name="logging.properties" />
+ </fileset>
+ <fileset dir="${basedir}/bin">
+ <include name="dist.properties" />
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="jason.infra.centralised.RunCentralisedMAS"/>
</manifest>
- </jar>
+ </jar>
<copy file="${jasonJar}" todir="applications/jason-eclipse-plugin/lib" />
- </target>
+ </target>
- <target name="signjar" depends="jar">
- <copy file="${jasonJar}" tofile="${jasonSJar}" />
- <signjar jar="${jasonSJar}" alias="jason" storepass="rbjhja" keypass="rbjhja" keystore="${basedir}/src/jasonKeystore" />
- </target>
-
- <target name="plugin" depends="compile, jar">
- <propertyfile file="${dist.properties}">
- <entry key="version" value="${version}" />
- <entry key="release" value="${release}" />
- <!-- entry default="0" key="build" operation="+" type="int" /-->
- <entry key="build.date" type="date" value="now" />
- </propertyfile>
- <property file="${dist.properties}" />
+ <target name="signjar" depends="jar">
+ <copy file="${jasonJar}" tofile="${jasonSJar}" />
+ <signjar jar="${jasonSJar}" alias="jason" storepass="rbjhja" keypass="rbjhja" keystore="${basedir}/src/jasonKeystore" />
+ </target>
+
+ <target name="plugin" depends="compile, jar">
+ <propertyfile file="${dist.properties}">
+ <entry key="version" value="${version}" />
+ <entry key="release" value="${release}" />
+ <!-- entry default="0" key="build" operation="+" type="int" /-->
+ <entry key="build.date" type="date" value="now" />
+ </propertyfile>
+ <property file="${dist.properties}" />
- <jar jarfile="${jedit.install.dir}/jars/${plugin.jar.name}">
- <fileset dir="${basedir}/src/jeditPlugin">
- <include name="Jason.props" />
- <include name="index.html" />
- <include name="actions.xml" />
- <include name="dockables.xml" />
- <include name="services.xml" />
- <include name="xmode.dtd" />
- </fileset>
- <fileset dir="${build.dir}">
- <include name="jason/**/*.class" />
- </fileset>
- <fileset dir="${basedir}/src">
- <include name="images/**/*" />
- <include name="xml/**/*" />
- <include name="templates/**/*" />
- <include name="logging.properties" />
- </fileset>
- <fileset dir="${basedir}/bin">
- <include name="dist.properties" />
- </fileset>
- </jar>
- <copy todir="${jedit.install.dir}/modes">
- <fileset dir="${basedir}/src/jeditPlugin">
- <include name="agentSpeak.xml" />
- <include name="jasonProject.xml" />
- <include name="catalog" />
- </fileset>
- </copy>
- <copy todir="${jedit.install.dir}/properties">
- <fileset dir="${basedir}/src/jeditPlugin">
- <include name="jedit-initial.props" />
- </fileset>
- </copy>
- </target>
+ <jar jarfile="${jedit.install.dir}/jars/${plugin.jar.name}">
+ <fileset dir="${basedir}/src/jeditPlugin">
+ <include name="Jason.props" />
+ <include name="index.html" />
+ <include name="actions.xml" />
+ <include name="dockables.xml" />
+ <include name="services.xml" />
+ <include name="xmode.dtd" />
+ </fileset>
+ <fileset dir="${build.dir}">
+ <include name="jason/**/*.class" />
+ </fileset>
+ <fileset dir="${basedir}/src">
+ <include name="images/**/*" />
+ <include name="xml/**/*" />
+ <include name="templates/**/*" />
+ <include name="logging.properties" />
+ </fileset>
+ <fileset dir="${basedir}/bin">
+ <include name="dist.properties" />
+ </fileset>
+ </jar>
+ <copy todir="${jedit.install.dir}/modes">
+ <fileset dir="${basedir}/src/jeditPlugin">
+ <include name="agentSpeak.xml" />
+ <include name="jasonProject.xml" />
+ <include name="catalog" />
+ </fileset>
+ </copy>
+ <copy todir="${jedit.install.dir}/properties">
+ <fileset dir="${basedir}/src/jeditPlugin">
+ <include name="jedit-initial.props" />
+ </fileset>
+ </copy>
+ </target>
- <target name="run" depends="jar,plugin">
- <java dir="bin" classname="org.gjt.sp.jedit.jEdit" fork="yes">
- <classpath refid="run.classpath" />
- </java>
- </target>
+ <target name="run" depends="jar,plugin">
+ <java dir="bin" classname="org.gjt.sp.jedit.jEdit" fork="yes">
+ <classpath refid="run.classpath" />
+ </java>
+ </target>
- <target name="test" depends="jar">
- <junit printsummary="yes" failureProperty="test.failure">
- <classpath refid="test.classpath" />
- <formatter type="plain" usefile="false" />
- <batchtest>
- <fileset dir="${basedir}/src" includes="**/test/*Test.java" />
- </batchtest>
- </junit>
- <fail message="test failed" if="test.failure" />
- <delete failonerror="no" verbose="false">
- <fileset dir="${basedir}" includes="bookstore.*" />
- </delete>
- </target>
+ <target name="test" depends="jar">
+ <junit printsummary="yes" failureProperty="test.failure">
+ <classpath refid="test.classpath" />
+ <formatter type="plain" usefile="false" />
+ <batchtest>
+ <fileset dir="${basedir}/src" includes="**/test/*Test.java" />
+ </batchtest>
+ </junit>
+ <fail message="test failed" if="test.failure" />
+ <delete failonerror="no" verbose="false">
+ <fileset dir="${basedir}" includes="bookstore.*" />
+ </delete>
+ </target>
- <!-- apidoc related tasks- -->
+ <!-- apidoc related tasks- -->
- <target name="apidoc" depends="compile,apidocsimple,apidocuml,apidoxygen" />
-
- <condition property="dot-ok" value="true">
- <or>
- <available file="dot" filepath="${env.PATH}" />
- <available file="dot.exe" filepath="${env.PATH}" />
- </or>
- </condition>
- <condition property="dot-nok" value="true">
- <not>
- <or>
- <available file="dot" filepath="${env.PATH}" />
- <available file="dot.exe" filepath="${env.PATH}" />
- </or>
- </not>
- </condition>
- <condition property="doxygen-nok" value="true">
- <not>
- <or>
- <available file="doxygen" filepath="${env.PATH}" />
- <available file="doxygen.exe" filepath="${env.PATH}" />
- </or>
- </not>
- </condition>
-
- <target name="apidocsimple" unless="dot-ok" >
- <javadoc
- destdir="${basedir}/doc/api"
- packagenames="jason.*"
- sourcepath="${basedir}/src"
- excludepackagenames="jason.asSyntax.parser,jason.mas2j.parser"
- use="true"
- version="true"
- author="true"
- windowtitle="Jason - AgentSpeak Java Interpreter"
- stylesheetfile="doc/faq/faq.css">
- <classpath refid="project.classpath" />
- </javadoc>
- </target>
-
- <target name="apidocuml" unless="dot-nok" >
- <javadoc
- destdir="${basedir}/doc/api"
- packagenames="jason.*"
- sourcepath="${basedir}/src"
- excludepackagenames="jason.asSyntax.parser,jason.mas2j.parser"
- use="true"
- version="true"
- author="true"
- windowtitle="Jason - AgentSpeak Java Interpreter"
- stylesheetfile="doc/faq/faq.css">
- <classpath refid="project.classpath" />
- <doclet name="org.umlgraph.doclet.UmlGraphDoc" path="lib/UMLGraph.jar">
- <!--param name="-inferrel"/ -->
- <!--param name="-inferdep"/-->
- <param name="-hide" value="java.*"/>
- <param name="-enumconstants" />
- <!--param name="-collpackages" value="java.util.*"/-->
- <param name="-qualify"/>
- <!--param name="-collapsible"/-->
- <param name="-postfixpackage"/>
- <param name="-nodefontsize" value="16"/>
- <param name="-nodefontpackagesize" value="12"/>
- <param name="-edgefontsize" value="14"/>
- <param name="-link" value="http://java.sun.com/j2se/1.5.0/docs/guide/javadoc/doclet/spec"/>
- <param name="-link" value="http://java.sun.com/j2se/1.5/docs/api"/>
- </doclet>
- </javadoc>
- </target>
- <target name="apidoxygen" unless="doxygen-nok" >
- <exec executable="doxygen">
- <arg line="doc/jason.doxygen"/>
- </exec>
- </target>
+ <target name="apidoc" depends="compile,apidocsimple,apidocuml,apidoxygen" />
+
+ <condition property="dot-ok" value="true">
+ <or>
+ <available file="dot" filepath="${env.PATH}" />
+ <available file="dot.exe" filepath="${env.PATH}" />
+ </or>
+ </condition>
+ <condition property="dot-nok" value="true">
+ <not>
+ <or>
+ <available file="dot" filepath="${env.PATH}" />
+ <available file="dot.exe" filepath="${env.PATH}" />
+ </or>
+ </not>
+ </condition>
+ <condition property="doxygen-nok" value="true">
+ <not>
+ <or>
+ <available file="doxygen" filepath="${env.PATH}" />
+ <available file="doxygen.exe" filepath="${env.PATH}" />
+ </or>
+ </not>
+ </condition>
+
+ <target name="apidocsimple" unless="dot-ok" >
+ <javadoc
+ destdir="${basedir}/doc/api"
+ packagenames="jason.*"
+ sourcepath="${basedir}/src"
+ excludepackagenames="jason.asSyntax.parser,jason.mas2j.parser"
+ use="true"
+ version="true"
+ author="true"
+ windowtitle="Jason - AgentSpeak Java Interpreter"
+ stylesheetfile="doc/faq/faq.css">
+ <classpath refid="project.classpath" />
+ </javadoc>
+ </target>
+
+ <target name="apidocuml" unless="dot-nok" >
+ <javadoc
+ destdir="${basedir}/doc/api"
+ packagenames="jason.*"
+ sourcepath="${basedir}/src"
+ excludepackagenames="jason.asSyntax.parser,jason.mas2j.parser"
+ use="true"
+ version="true"
+ author="true"
+ windowtitle="Jason - AgentSpeak Java Interpreter"
+ stylesheetfile="doc/faq/faq.css">
+ <classpath refid="project.classpath" />
+ <doclet name="org.umlgraph.doclet.UmlGraphDoc" path="lib/UMLGraph.jar">
+ <!--param name="-inferrel"/ -->
+ <!--param name="-inferdep"/-->
+ <param name="-hide" value="java.*"/>
+ <param name="-enumconstants" />
+ <!--param name="-collpackages" value="java.util.*"/-->
+ <param name="-qualify"/>
+ <!--param name="-collapsible"/-->
+ <param name="-postfixpackage"/>
+ <param name="-nodefontsize" value="16"/>
+ <param name="-nodefontpackagesize" value="12"/>
+ <param name="-edgefontsize" value="14"/>
+ <param name="-link" value="http://java.sun.com/j2se/1.5.0/docs/guide/javadoc/doclet/spec"/>
+ <param name="-link" value="http://java.sun.com/j2se/1.5/docs/api"/>
+ </doclet>
+ </javadoc>
+ </target>
+ <target name="apidoxygen" unless="doxygen-nok" >
+ <exec executable="doxygen">
+ <arg line="doc/jason.doxygen"/>
+ </exec>
+ </target>
- <!-- distribution related tasks -->
-
- <target name="dist" depends="cleanExamples,plugin" description="Build distribution.">
+ <!-- distribution related tasks -->
+
+ <target name="dist" depends="cleanExamples,plugin" description="Build distribution.">
- <echo message="Generating Jason ${version}.${release}" />
+ <echo message="Generating Jason ${version}.${release}" />
- <fixcrlf eol="crlf" includes="**/*.txt,**/*.bat" srcdir="${basedir}" />
+ <fixcrlf eol="crlf" includes="**/*.txt,**/*.bat" srcdir="${basedir}" />
- <delete failonerror="no" includeEmptyDirs="true">
- <fileset dir="${distDir}" />
- </delete>
- <delete dir="${distDir}/.." />
+ <fixcrlf tab="remove" tablength="4" javafiles="true" includes="**/*.java" srcdir="${basedir}/src" />
- <mkdir dir="${distDir}" />
+ <delete failonerror="no" includeEmptyDirs="true">
+ <fileset dir="${distDir}" />
+ </delete>
+ <delete dir="${distDir}/.." />
- <copy todir="${distDir}">
- <fileset dir="${basedir}" includes="*.*" />
- <fileset dir="${basedir}" includes="LICENSE" />
- <fileset dir="${basedir}" includes="README" />
+ <mkdir dir="${distDir}" />
- <fileset dir="${basedir}" includes="bin/*" excludes="bin/jedit.tgz" />
- <fileset dir="${basedir}" includes="bin/jedit/**/*" />
- <fileset dir="${basedir}" includes="doc/**/*" />
- <fileset dir="${basedir}" includes="examples/**/*" />
- <fileset dir="${basedir}" includes="demos/**/*" />
- <fileset dir="${basedir}" includes="lib/**/*" />
- <fileset dir="${basedir}" includes="src/**/*" />
- </copy>
+ <copy todir="${distDir}">
+ <fileset dir="${basedir}" includes="*.*" />
+ <fileset dir="${basedir}" includes="LICENSE" />
+ <fileset dir="${basedir}" includes="README" />
- <!--delete failonerror="no" includeEmptyDirs="true">
- <fileset dir="${distDir}" includes=".settings" />
- <fileset dir="${distDir}" includes=".project" />
- <fileset dir="${distDir}" includes=".classpath" />
- </delete -->
- <delete dir="${distDir}/bin/classes" />
- <delete dir="${distDir}/bin/classes-eclipse" />
- <delete dir="${distDir}/doc/faq" />
- <delete dir="${distDir}/doc/mini-tutorial/src" />
+ <fileset dir="${basedir}" includes="bin/*" excludes="bin/jedit.tgz" />
+ <fileset dir="${basedir}" includes="bin/jedit/**/*" />
+ <fileset dir="${basedir}" includes="doc/**/*" />
+ <fileset dir="${basedir}" includes="examples/**/*" />
+ <fileset dir="${basedir}" includes="demos/**/*" />
+ <fileset dir="${basedir}" includes="lib/**/*" />
+ <fileset dir="${basedir}" includes="src/**/*" />
+ </copy>
- <tar compression="gzip" tarfile="${distFile}.tgz" longfile="gnu">
- <tarfileset dir="${distDir}/.." mode="755">
- <include name="Jason-${version}.${release}/**/*.sh" />
- <include name="Jason-${version}.${release}/**/asl2*" />
- </tarfileset>
- <tarfileset dir="${distDir}/..">
- <include name="Jason-${version}.${release}/**/*" />
- <exclude name="Jason-${version}.${release}/**/*.sh" />
- <exclude name="Jason-${version}.${release}/**/asl2*" />
- </tarfileset>
- </tar>
- </target>
+ <!--delete failonerror="no" includeEmptyDirs="true">
+ <fileset dir="${distDir}" includes=".settings" />
+ <fileset dir="${distDir}" includes=".project" />
+ <fileset dir="${distDir}" includes=".classpath" />
+ </delete -->
+ <delete dir="${distDir}/bin/classes" />
+ <delete dir="${distDir}/bin/classes-eclipse" />
+ <delete dir="${distDir}/doc/faq" />
+ <delete dir="${distDir}/doc/mini-tutorial/src" />
- <target name="all" depends="parsers,compile,apidoc" description="Build everything.">
- <echo message="Application built." />
- </target>
+ <tar compression="gzip" tarfile="${distFile}.tgz" longfile="gnu">
+ <tarfileset dir="${distDir}/.." mode="755">
+ <include name="Jason-${version}.${release}/**/*.sh" />
+ <include name="Jason-${version}.${release}/**/asl2*" />
+ </tarfileset>
+ <tarfileset dir="${distDir}/..">
+ <include name="Jason-${version}.${release}/**/*" />
+ <exclude name="Jason-${version}.${release}/**/*.sh" />
+ <exclude name="Jason-${version}.${release}/**/asl2*" />
+ </tarfileset>
+ </tar>
+ </target>
- <target name="cleanExamples">
- <delete failonerror="no" includeEmptyDirs="true" verbose="true">
- <fileset dir="${basedir}/examples" includes="**/bin/**" />
- <fileset dir="${basedir}/demos" includes="**/bin/**" />
-
- <fileset dir="${basedir}/examples" includes="**/work" />
+ <target name="all" depends="parsers,compile,apidoc" description="Build everything.">
+ <echo message="Application built." />
+ </target>
- <fileset dir="${basedir}/examples" includes="**/.stop___MAS" />
- <fileset dir="${basedir}/demos" includes="**/.stop___MAS" />
-
- <fileset dir="${basedir}/examples" includes="**/*-jws/**" />
+ <target name="cleanExamples">
+ <delete failonerror="no" includeEmptyDirs="true" verbose="true">
+ <fileset dir="${basedir}/examples" includes="**/bin/**" />
+ <fileset dir="${basedir}/demos" includes="**/bin/**" />
+
+ <fileset dir="${basedir}/examples" includes="**/work" />
- <fileset dir="${basedir}/examples" includes="**/APDescription.txt" />
- <fileset dir="${basedir}/demos" includes="**/APDescription.txt" />
-
- <fileset dir="${basedir}/examples" includes="**/MTPs-Main-Container.txt" />
- <fileset dir="${basedir}/demos" includes="**/MTPs-Main-Container.txt" />
-
- <fileset dir="${basedir}/examples/sniffer" includes="log.*" />
- <fileset dir="${basedir}/demos/persistent-belief-base" includes="a.bb" />
+ <fileset dir="${basedir}/examples" includes="**/.stop___MAS" />
+ <fileset dir="${basedir}/demos" includes="**/.stop___MAS" />
+
+ <fileset dir="${basedir}/examples" includes="**/*-jws/**" />
- <fileset defaultexcludes="no" dir="${basedir}" includes="**/*~" />
- </delete>
- </target>
+ <fileset dir="${basedir}/examples" includes="**/APDescription.txt" />
+ <fileset dir="${basedir}/demos" includes="**/APDescription.txt" />
+
+ <fileset dir="${basedir}/examples" includes="**/MTPs-Main-Container.txt" />
+ <fileset dir="${basedir}/demos" includes="**/MTPs-Main-Container.txt" />
+
+ <fileset dir="${basedir}/examples/sniffer" includes="log.*" />
+ <fileset dir="${basedir}/demos/persistent-belief-base" includes="a.bb" />
- <target name="clean">
- <delete failonerror="no" includeEmptyDirs="true" verbose="true">
- <fileset defaultexcludes="no" dir="${basedir}" includes="**/*~" />
- <fileset dir="${basedir}" includes="**/*.class" excludes="applications/**/*"/>
- <fileset dir="${basedir}" includes="**/core" />
- <fileset dir="${basedir}/doc/api" includes="**/*" />
- <fileset dir="${basedir}" includes="**/.nbattrs" />
- <fileset dir="${basedir}" includes="**/*.backup" />
- <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>
+ <fileset defaultexcludes="no" dir="${basedir}" includes="**/*~" />
+ </delete>
+ </target>
+ <target name="clean">
+ <delete failonerror="no" includeEmptyDirs="true" verbose="true">
+ <fileset defaultexcludes="no" dir="${basedir}" includes="**/*~" />
+ <fileset dir="${basedir}" includes="**/*.class" excludes="applications/**/*"/>
+ <fileset dir="${basedir}" includes="**/core" />
+ <fileset dir="${basedir}/doc/api" includes="**/*" />
+ <fileset dir="${basedir}" includes="**/.nbattrs" />
+ <fileset dir="${basedir}" includes="**/*.backup" />
+ <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>
+
</project>
Modified: trunk/src/jason/JasonException.java
===================================================================
--- trunk/src/jason/JasonException.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/JasonException.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -36,15 +36,15 @@
public class JasonException extends java.lang.Exception {
- private static final long serialVersionUID = 1L;
-
- public static final Term WRONG_ARGS = new Atom("wrong_arguments");
+ private static final long serialVersionUID = 1L;
+
+ public static final Term WRONG_ARGS = new Atom("wrong_arguments");
public static final Term UNKNOW_ERROR = new Atom("unknown");
- private static final Term defaultError = new Atom("internal_action");
- private Term error = defaultError;
+ private static final Term defaultError = new Atom("internal_action");
+ private Term error = defaultError;
- /**
+ /**
* Creates a new instance of <code>JasonException</code> without detail message.
*/
public JasonException() {
Modified: trunk/src/jason/ReceiverNotFoundException.java
===================================================================
--- trunk/src/jason/ReceiverNotFoundException.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/ReceiverNotFoundException.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -27,7 +27,7 @@
public class ReceiverNotFoundException extends java.lang.Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
public ReceiverNotFoundException() {
}
Modified: trunk/src/jason/architecture/AgArch.java
===================================================================
--- trunk/src/jason/architecture/AgArch.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/architecture/AgArch.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -104,7 +104,7 @@
return ts;
}
public void setTS(TransitionSystem ts) {
- this.ts = ts;
+ this.ts = ts;
}
/** Gets the agent's perception as a list of Literals.
@@ -135,7 +135,7 @@
/** Puts the agent in sleep. */
public void sleep() {
- archTier.sleep();
+ archTier.sleep();
}
/** Gets the agent's name */
Modified: trunk/src/jason/asSemantics/ActionExec.java
===================================================================
--- trunk/src/jason/asSemantics/ActionExec.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/asSemantics/ActionExec.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -36,10 +36,10 @@
public class ActionExec implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private Literal action;
- private Intention intention;
+ private Intention intention;
private boolean result;
public ActionExec(Literal ac, Intention i) {
@@ -69,13 +69,13 @@
}
public Intention getIntention() {
- return intention;
+ return intention;
}
public boolean getResult() {
- return result;
+ return result;
}
public void setResult(boolean ok) {
- result = ok;
+ result = ok;
}
public String toString() {
@@ -83,17 +83,17 @@
}
protected ActionExec clone() {
- ActionExec ae = new ActionExec((Pred)action.clone(), intention.clone());
- ae.result = this.result;
- return ae;
+ ActionExec ae = new ActionExec((Pred)action.clone(), intention.clone());
+ ae.result = this.result;
+ return ae;
}
/** get as XML */
- public Element getAsDOM(Document document) {
- Element eact = (Element) document.createElement("action");
- eact.setAttribute("term", action.toString());
- eact.setAttribute("result", result+"");
- eact.setAttribute("intention", intention.getId()+"");
- return eact;
- }
+ public Element getAsDOM(Document document) {
+ Element eact = (Element) document.createElement("action");
+ eact.setAttribute("term", action.toString());
+ eact.setAttribute("result", result+"");
+ eact.setAttribute("intention", intention.getId()+"");
+ return eact;
+ }
}
Modified: trunk/src/jason/asSemantics/Agent.java
===================================================================
--- trunk/src/jason/asSemantics/Agent.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/asSemantics/Agent.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -115,15 +115,15 @@
setASLSrc(asSrc);
if (asSrc.startsWith(Include.CRPrefix)) {
- // loads the class from a jar file (for example)
+ // loads the class from a jar file (for example)
parseAS(Agent.class.getResource(asSrc.substring(Include.CRPrefix.length())).openStream());
} else {
- // check whether source is an URL string
- try {
- parsingOk = parseAS(new URL(asSrc));
- } catch (MalformedURLException e) {
- parsingOk = parseAS(new File(asSrc));
- }
+ // check whether source is an URL string
+ try {
+ parsingOk = parseAS(new URL(asSrc));
+ } catch (MalformedURLException e) {
+ parsingOk = parseAS(new File(asSrc));
+ }
}
}
@@ -184,18 +184,18 @@
* A new TS is created (based on the cloned circumstance).
*/
public Agent clone(AgArch arch) {
- Agent a = new Agent();
-
- a.setLogger(arch);
+ Agent a = new Agent();
+
+ a.setLogger(arch);
a.logger.setLevel(this.getTS().getSettings().logLevel());
- a.bb = (BeliefBase)this.bb.clone();
- a.pl = (PlanLibrary)this.pl.clone();
- a.aslSource = this.aslSource;
- a.initDefaultFunctions();
+ a.bb = (BeliefBase)this.bb.clone();
+ a.pl = (PlanLibrary)this.pl.clone();
+ a.aslSource = this.aslSource;
+ a.initDefaultFunctions();
a.setTS(new TransitionSystem(a, (Circumstance)this.getTS().getC().clone(), this.getTS().getSettings(), arch));
- return a;
+ return a;
}
public void setLogger(AgArch arch) {
@@ -222,7 +222,7 @@
public void setASLSrc(String file) {
if (file != null && file.startsWith("./"))
file = file.substring(2);
- aslSource = file;
+ aslSource = file;
}
/** Adds beliefs and plans form an URL */
@@ -267,20 +267,20 @@
}
@SuppressWarnings("unchecked")
- public InternalAction getIA(String iaName) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ public InternalAction getIA(String iaName) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
if (iaName.charAt(0) == '.')
iaName = "jason.stdlib" + iaName;
InternalAction objIA = internalActions.get(iaName);
if (objIA == null) {
- Class iaclass = Class.forName(iaName);
- try {
- // check if the class has "create" method -- singleton implementation
- Method create = iaclass.getMethod("create", (Class[])null);
- objIA = (InternalAction)create.invoke(null, (Object[])null);
- } catch (Exception e) {
- objIA = (InternalAction)iaclass.newInstance();
- }
- internalActions.put(iaName, objIA);
+ Class iaclass = Class.forName(iaName);
+ try {
+ // check if the class has "create" method -- singleton implementation
+ Method create = iaclass.getMethod("create", (Class[])null);
+ objIA = (InternalAction)create.invoke(null, (Object[])null);
+ } catch (Exception e) {
+ objIA = (InternalAction)iaclass.newInstance();
+ }
+ internalActions.put(iaName, objIA);
}
return objIA;
}
@@ -338,13 +338,13 @@
public void addInitialGoal(Literal g) {
- initialGoals.add(g);
+ initialGoals.add(g);
}
public void addInitialBel(Literal b) {
- initialBels.add(b);
+ initialBels.add(b);
}
public List<Literal> getInitialBels() {
- return initialBels;
+ return initialBels;
}
/** add the initial beliefs in BB and produce the corresponding events */
@@ -361,20 +361,20 @@
// does not do BRF for rules (and so do not produce events +bel for rules)
if (b.isRule())
- getBB().add(b);
+ getBB().add(b);
else
- addBel(b);
+ addBel(b);
}
initialBels.clear();
}
public void addInitialGoalsInTS() {
- for (Literal g: initialGoals) {
- g.makeVarsAnnon();
- if (! g.hasSource())
- g.addAnnot(BeliefBase.TSelf);
- getTS().getC().addAchvGoal(g,Intention.EmptyInt);
- }
+ for (Literal g: initialGoals) {
+ g.makeVarsAnnon();
+ if (! g.hasSource())
+ g.addAnnot(BeliefBase.TSelf);
+ getTS().getC().addAchvGoal(g,Intention.EmptyInt);
+ }
}
/** Imports beliefs, plans and initial goals from another agent. Initial beliefs and goals
@@ -382,17 +382,17 @@
* The methods addInitialBelsInBB and addInitialGoalsInTS should be called in the sequel to
* add those beliefs and goals into the agent. */
public void importComponents(Agent a) throws JasonException {
- if (a != null) {
- for (Literal b: a.initialBels) {
- this.addInitialBel(b);
- }
- for (Literal g: a.initialGoals) {
- this.addInitialGoal(g);
- }
- for (Plan p: a.getPL()) {
- this.getPL().add(p, false);
- }
- }
+ if (a != null) {
+ for (Literal b: a.initialBels) {
+ this.addInitialBel(b);
+ }
+ for (Literal g: a.initialGoals) {
+ this.addInitialGoal(g);
+ }
+ for (Plan p: a.getPL()) {
+ this.getPL().add(p, false);
+ }
+ }
}
@@ -431,7 +431,7 @@
public ActionExec selectAction(List<ActionExec> actList) {
// make sure the selected Action is removed from actList
// (do not return suspended intentions)
- synchronized (actList) {
+ synchronized (actList) {
Iterator<ActionExec> i = actList.iterator();
while (i.hasNext()) {
ActionExec a = i.next();
@@ -439,8 +439,8 @@
i.remove();
return a;
}
- }
- }
+ }
+ }
return null;
}
@@ -463,7 +463,7 @@
}
public void setPL(PlanLibrary pl) {
- this.pl = pl;
+ this.pl = pl;
}
public PlanLibrary getPL() {
@@ -486,8 +486,8 @@
boolean wasPerceived = false;
Iterator<Literal> ip = percepts.iterator();
while (ip.hasNext()) {
- Literal t = ip.next();
-
+ Literal t = ip.next();
+
// if perception t is already in BB
if (l.equalsAsStructure(t) && l.negated() == t.negated()) {
wasPerceived = true;
@@ -518,10 +518,10 @@
l = (Literal)l.clone();
l.clearAnnots();
l.addAnnot(BeliefBase.TPercept);
- if (bb.remove(l)) {
- ts.updateEvents(new Event(new Trigger(TEOperator.del, TEType.belief, l), Intention.EmptyInt));
- }
- */
+ if (bb.remove(l)) {
+ ts.updateEvents(new Event(new Trigger(TEOperator.del, TEType.belief, l), Intention.EmptyInt));
+ }
+ */
}
}
@@ -599,42 +599,42 @@
List<Literal>[] result = null;
try {
- if (beliefToAdd != null) {
- if (logger.isLoggable(Level.FINE)) logger.fine("adding belief " + beliefToAdd);
-
- if (getBB().add(beliefToAdd)) {
- result = new List[2];
- result[0] = Collections.singletonList(beliefToAdd);
- result[1] = Collections.emptyList();
- }
- }
-
- if (beliefToDel != null) {
- Unifier u = null;
- try {
- u = i.peek().unif; // get from current intention
- } catch (Exception e) {
- u = new Unifier();
- }
-
- if (logger.isLoggable(Level.FINE)) logger.fine("doing brf for " + beliefToDel + " in BB=" + believes(beliefToDel, u));
-
- if (believes(beliefToDel, u)) {
- beliefToDel.apply(u);
- if (getBB().remove(beliefToDel)) {
- if (logger.isLoggable(Level.FINE)) logger.fine("Removed:" + beliefToDel);
- if (result == null) {
- result = new List[2];
- result[0] = Collections.emptyList();
- }
- result[1] = Collections.singletonList(beliefToDel);
- }
- }
-
- }
- } catch (Exception e) {
- logger.log(Level.WARNING, "Error at BRF.",e);
- }
+ if (beliefToAdd != null) {
+ if (logger.isLoggable(Level.FINE)) logger.fine("adding belief " + beliefToAdd);
+
+ if (getBB().add(beliefToAdd)) {
+ result = new List[2];
+ result[0] = Collections.singletonList(beliefToAdd);
+ result[1] = Collections.emptyList();
+ }
+ }
+
+ if (beliefToDel != null) {
+ Unifier u = null;
+ try {
+ u = i.peek().unif; // get from current intention
+ } catch (Exception e) {
+ u = new Unifier();
+ }
+
+ if (logger.isLoggable(Level.FINE)) logger.fine("doing brf for " + beliefToDel + " in BB=" + believes(beliefToDel, u));
+
+ if (believes(beliefToDel, u)) {
+ beliefToDel.apply(u);
+ if (getBB().remove(beliefToDel)) {
+ if (logger.isLoggable(Level.FINE)) logger.fine("Removed:" + beliefToDel);
+ if (result == null) {
+ result = new List[2];
+ result[0] = Collections.emptyList();
+ }
+ result[1] = Collections.singletonList(beliefToDel);
+ }
+ }
+
+ }
+ } catch (Exception e) {
+ logger.log(Level.WARNING, "Error at BRF.",e);
+ }
return result;
}
@@ -758,7 +758,7 @@
Document document = builder.newDocument();
Element ag = (Element) document.createElement("agent");
if (getASLSrc() != null && getASLSrc().length() > 0) {
- ag.setAttribute("source", getASLSrc());
+ ag.setAttribute("source", getASLSrc());
}
ag.appendChild(bb.getAsDOM(document));
ag.appendChild(pl.getAsDOM(document));
Modified: trunk/src/jason/asSemantics/Circumstance.java
===================================================================
--- trunk/src/jason/asSemantics/Circumstance.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/asSemantics/Circumstance.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -45,7 +45,7 @@
public class Circumstance implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private Queue<Event> E;
private Queue<Intention> I;
@@ -66,7 +66,7 @@
private List<CircumstanceListener> listeners = new CopyOnWriteArrayList<CircumstanceListener>();
public Circumstance() {
- create();
+ create();
reset();
}
@@ -78,7 +78,7 @@
MB = new LinkedList<Message>();
PA = new ConcurrentHashMap<Integer, ActionExec>();
PI = new ConcurrentHashMap<String, Intention>();
- FA = new ArrayList<ActionExec>();
+ FA = new ArrayList<ActionExec>();
}
/** set null for A, RP, AP, SE, SO, and SI */
@@ -237,7 +237,7 @@
}
public void clearPendingIntentions() {
- PI.clear();
+ PI.clear();
}
public boolean dropPendingIntention(Intention i) {
@@ -269,7 +269,7 @@
}
public boolean hasFeedbackAction() {
- return !FA.isEmpty();
+ return !FA.isEmpty();
}
public List<ActionExec> getFeedbackActions() {
@@ -277,11 +277,11 @@
}
public void addFeedbackAction(ActionExec act) {
- if (act.getIntention() != null) {
- synchronized (FA) {
- FA.add(act);
- }
- }
+ if (act.getIntention() != null) {
+ synchronized (FA) {
+ FA.add(act);
+ }
+ }
}
public Map<Integer, ActionExec> getPendingActions() {
@@ -289,7 +289,7 @@
}
public void clearPendingActions() {
- PA.clear();
+ PA.clear();
}
public boolean hasPendingAction() {
@@ -330,26 +330,26 @@
/** clone E, I, MB, PA, PI, FA, and AI */
public Object clone() {
- Circumstance c = new Circumstance();
- for (Event e: this.E) {
- c.E.add((Event)e.clone());
- }
- for (Intention i: this.I) {
- c.I.add((Intention)i.clone());
- }
- for (Message m: this.MB) {
- c.MB.add((Message)m.clone());
- }
- for (int k: this.PA.keySet()) {
- c.PA.put(k, (ActionExec)PA.get(k).clone());
- }
- for (String k: this.PI.keySet()) {
- c.PI.put(k, (Intention)PI.get(k).clone());
- }
- for (ActionExec ae: FA) {
- c.FA.add((ActionExec)ae.clone());
- }
- return c;
+ Circumstance c = new Circumstance();
+ for (Event e: this.E) {
+ c.E.add((Event)e.clone());
+ }
+ for (Intention i: this.I) {
+ c.I.add((Intention)i.clone());
+ }
+ for (Message m: this.MB) {
+ c.MB.add((Message)m.clone());
+ }
+ for (int k: this.PA.keySet()) {
+ c.PA.put(k, (ActionExec)PA.get(k).clone());
+ }
+ for (String k: this.PI.keySet()) {
+ c.PI.put(k, (Intention)PI.get(k).clone());
+ }
+ for (ActionExec ae: FA) {
+ c.FA.add((ActionExec)ae.clone());
+ }
+ return c;
}
@@ -534,20 +534,20 @@
}
public String toString() {
- StringBuilder s = new StringBuilder("Circumstance:\n");
- s.append(" E ="+E +"\n");
- s.append(" I ="+I +"\n");
- s.append(" A ="+A +"\n");
- s.append(" MB="+MB+"\n");
- s.append(" RP="+RP+"\n");
- s.append(" AP="+AP+"\n");
- s.append(" SE="+SE+"\n");
- s.append(" SO="+SO+"\n");
- s.append(" SI="+SI+"\n");
- s.append(" AI="+AI+"\n");
- s.append(" PA="+PA+"\n");
- s.append(" PI="+PI+"\n");
- s.append(" FA="+FA+".");
+ StringBuilder s = new StringBuilder("Circumstance:\n");
+ s.append(" E ="+E +"\n");
+ s.append(" I ="+I +"\n");
+ s.append(" A ="+A +"\n");
+ s.append(" MB="+MB+"\n");
+ s.append(" RP="+RP+"\n");
+ s.append(" AP="+AP+"\n");
+ s.append(" SE="+SE+"\n");
+ s.append(" SO="+SO+"\n");
+ s.append(" SI="+SI+"\n");
+ s.append(" AI="+AI+"\n");
+ s.append(" PA="+PA+"\n");
+ s.append(" PI="+PI+"\n");
+ s.append(" FA="+FA+".");
return s.toString();
}
Modified: trunk/src/jason/asSemantics/CircumstanceListener.java
===================================================================
--- trunk/src/jason/asSemantics/CircumstanceListener.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk/src/jason/asSemantics/CircumstanceListener.java 2008-09-29 08:38:52 UTC (rev 1386)
@@ -2,7 +2,7 @@
public interface CircumstanceListener {
- public void eventAdded(Event e);
- public void intentionAdded(Intention i);
- public void intentionDropped(Intention i);
+ public void eventAdded(Event e);
+ public void intentionAdded(Intention i);
+ public void intentionDropped(Intention i);
}
Modified: trunk/src/jason/asSemantics/Event.java
===================================================================
--- trunk/src/jason/asSemantics/Event.java 2008-09-28 13:28:57 UTC (rev 1385)
+++ trunk...
[truncated message content] |
